Module Name:    src
Committed By:   nia
Date:           Mon Jun  6 10:57:05 UTC 2022

Modified Files:
        src/distrib/sets/lists/tests: mi

Log Message:
Remove accidentally committed merge conflict line.


To generate a diff of this commit:
cvs rdiff -u -r1.1210 -r1.1211 src/distrib/sets/lists/tests/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1210 src/distrib/sets/lists/tests/mi:1.1211
--- src/distrib/sets/lists/tests/mi:1.1210	Mon Jun  6 10:56:28 2022
+++ src/distrib/sets/lists/tests/mi	Mon Jun  6 10:57:05 2022
@@ -1,5 +1,4 @@
-=======
-# $NetBSD: mi,v 1.1210 2022/06/06 10:56:28 nia Exp $
+# $NetBSD: mi,v 1.1211 2022/06/06 10:57:05 nia Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #

Reply via email to