projects / selector.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6bfacc5)
Fixed merge conflict.
authorFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:41:38 +0000 (09:41 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:41:38 +0000 (09:41 +0200)
REVISION_NUMBER patch | blob | history

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
index 87f6629..fba7ed5 100644 (file)
--- a/REVISION_NUMBER
+++ b/REVISION_NUMBER
@@ -1,5 +1 @@
-<<<<<<< HEAD:REVISION_NUMBER
 143
-=======
-142
->>>>>>> 38e62ee50d9f4b6f77a34f6841a2db635e2553df:REVISION_NUMBER
A real-time interactive pattern matcher in console.