Index: README.release
===================================================================
diff -u -N -rbe7f435e06489b27b940bcddbbc4413935642d50 -r6fc1fe6cab0508c8de5f79b07ce813d40247e798
--- README.release	(.../README.release)	(revision be7f435e06489b27b940bcddbbc4413935642d50)
+++ README.release	(.../README.release)	(revision 6fc1fe6cab0508c8de5f79b07ce813d40247e798)
@@ -98,7 +98,6 @@
      git checkout -b 2.3 2.3.0
      git push origin 2.3
      register a cron task for the new branch on Travis (website)
->>>>>>> c80b57b9fbb2735d12418c3f634390141b50a94b
 
    - build tar
        * (make sure accurate COMMIT file is present, e.g., run ./configure once?)