diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e29ebdc7..a835e104 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,10 @@ # 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) |