Browse code

typo fixed (conflict mark removed)

Jiri Kuthan authored on 04/11/2003 02:05:36
Showing 1 changed files
... ...
@@ -1,6 +1,5 @@
1 1
 #!/bin/sh   
2 2
 #
3
-<<<<<<< sc
4 3
 # $Id$
5 4
 #
6 5
 # sc: ser control; tool for maintaining ser's databases