mirror of
				https://github.com/qgis/QGIS.git
				synced 2025-11-03 00:14:12 -05:00 
			
		
		
		
	
		
			
				
	
	
		
			25 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			25 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/bash
 | 
						|
###########################################################################
 | 
						|
#    remove_git_confict_files.sh
 | 
						|
#    ---------------------
 | 
						|
#    Date                 : April 2012
 | 
						|
#    Copyright            : (C) 2012 by Tim Sutton
 | 
						|
#    Email                : tim dot linfiniti at com
 | 
						|
###########################################################################
 | 
						|
#                                                                         #
 | 
						|
#   This program is free software; you can redistribute it and/or modify  #
 | 
						|
#   it under the terms of the GNU General Public License as published by  #
 | 
						|
#   the Free Software Foundation; either version 2 of the License, or     #
 | 
						|
#   (at your option) any later version.                                   #
 | 
						|
#                                                                         #
 | 
						|
###########################################################################
 | 
						|
 | 
						|
 | 
						|
#
 | 
						|
# A simple script to get rid of .orig and .rej files left in 
 | 
						|
# your repository by svn. It will request confirmation before 
 | 
						|
# deleting each file.
 | 
						|
#
 | 
						|
# Tim Sutton, May 2008
 | 
						|
find . -name "*.orig" -exec rm -rf {} \;
 |