2 år sedan · ba7533df51
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 
				 *.txt
			
 
				-<<<<<<< HEAD
			
 
				-=======
			
 
				 .gitignore
			
 
				->>>>>>> dev
			
 
				 ./USER
			
 
				 /FILES
			
 
				 /USER