We are idiots
This commit is contained in:
		
							
								
								
									
										4
									
								
								motd.sh
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								motd.sh
									
									
									
									
									
								
							@@ -1,10 +1,6 @@
 | 
				
			|||||||
# Fancy waifu motd
 | 
					# Fancy waifu motd
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
MOTDPATH="$HOME/src/motd"          # path to motd folder
 | 
					 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"          # path to motd folder
 | 
					MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"          # path to motd folder
 | 
				
			||||||
>>>>>>> 01b098ef55e85b9ed6e37c03428b18db0e93a44f
 | 
					 | 
				
			||||||
CACHEFILE="/tmp/waifu.cache"          # to cache waifu state
 | 
					CACHEFILE="/tmp/waifu.cache"          # to cache waifu state
 | 
				
			||||||
RESOLUTION=256                        # resolution of waifu
 | 
					RESOLUTION=256                        # resolution of waifu
 | 
				
			||||||
CENTER=true                           # center motd?
 | 
					CENTER=true                           # center motd?
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user