merge fuck up fix
This commit is contained in:
		
							
								
								
									
										14
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								LICENSE
									
									
									
									
									
								
							@@ -1,4 +1,3 @@
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 | 
			
		||||
Version 2, December 2004
 | 
			
		||||
 | 
			
		||||
@@ -10,16 +9,3 @@ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 | 
			
		||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 | 
			
		||||
 | 
			
		||||
  0. You just DO WHAT THE FUCK YOU WANT TO.
 | 
			
		||||
=======
 | 
			
		||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 | 
			
		||||
Version 2, December 2004
 | 
			
		||||
 | 
			
		||||
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
 | 
			
		||||
 | 
			
		||||
Everyone is permitted to copy and distribute verbatim or modified copies of this license document, and changing it is allowed as long as the name is changed.
 | 
			
		||||
 | 
			
		||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 | 
			
		||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 | 
			
		||||
 | 
			
		||||
  0. You just DO WHAT THE FUCK YOU WANT TO.
 | 
			
		||||
>>>>>>> 0e6e9d8 (start transition from rules.mirzaev.sexy)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user