From 0ced25ce5053dcc66650c87c12a61800b884d78b Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 1 Apr 2020 09:30:29 +0100
Subject: Fix configure.ac.

---
 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a835e104..e29ebdc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,6 @@
 # configure.ac
 
-<<<<<<< HEAD
 AC_INIT([tmux], next-3.2)
-=======
-AC_INIT([tmux], 3.1-rc3)
->>>>>>> 3.1-rc
 AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR(etc)
-- 
cgit