typo fixed (conflict mark removed)

scripts/sc

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