aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2020-04-01 09:30:29 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-04-01 09:30:29 +0100
commit0ced25ce5053dcc66650c87c12a61800b884d78b (patch)
treec4a81ea53cf1eeb0e9dd33c03bdca3f902fb2d59 /configure.ac
parent1d4cdbc2277953603352dce766c77f8bae4d621c (diff)
downloadrtmux-0ced25ce5053dcc66650c87c12a61800b884d78b.tar.gz
rtmux-0ced25ce5053dcc66650c87c12a61800b884d78b.tar.bz2
rtmux-0ced25ce5053dcc66650c87c12a61800b884d78b.zip
Fix configure.ac.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 0 insertions, 4 deletions
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)