Fix indentation from 2c705843.

[radsecproxy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 570c5dd..a74a054 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,7 @@
-<<<<<<< HEAD
-AC_INIT(radsecproxy, 1.5-dev, radsecproxy@uninett.no)
-=======
-AC_INIT(radsecproxy, 1.4.3, radsecproxy@uninett.no)
->>>>>>> master
+AC_INIT(radsecproxy, 1.6-dev, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC
-AM_PROG_CC_C_O
 AC_PROG_RANLIB
 udp=yes
 AC_ARG_ENABLE(udp,