diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 570c5dd..3ff1cc3 100644 --- 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_CANONICAL_TARGET AM_INIT_AUTOMAKE AC_PROG_CC |