typo fixed (conflict mark removed) · e8e2091d9a - Gogs

typo fixed (conflict mark removed)

Jiri Kuthan 22 years ago

parent

7f1e79040f

commit

e8e2091d9a

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
scripts/sc
							 
								View File
							
				@@ -1,6 +1,5 @@
			
				 #!/bin/sh   
			
				 #
			
				-<<<<<<< sc
			
				 # $Id$
			
				 #
			
				 # sc: ser control; tool for maintaining ser's databases