Changeset e88477a in freewrt

Timestamp:

Jun 8, 2007, 11:16:36 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

95e2984

Parents:

947af00

Message:

thou shalt not commit conflict markers
(doesn't svn warn here? cvs does…)

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2739 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/fwifupdown/files/ifupdown.init (modified) (2 diffs)

package/fwifupdown/files/ifupdown.init

@@ -1 @@
-<<<<<<< .mine
-=======
+#!/bin/sh
 #FWINIT 10
 case $1 in
@@ -15 +14 @@
 esac
 exit $?
->>>>>>> .r2645