cosmetics

[libradsec.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 570c5dd..66bee68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-AC_INIT(radsecproxy, 1.5-dev, radsecproxy@uninett.no)
-=======
-AC_INIT(radsecproxy, 1.4.3, radsecproxy@uninett.no)
->>>>>>> master
+AC_INIT(radsecproxy, 1.5, radsecproxy@uninett.no)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_PROG_CC