diff options
| author | Linus Nordberg <linus@nordu.net> | 2011-09-28 14:22:46 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2011-09-28 14:22:46 +0200 |
| commit | fa0bb1335e43d83e08d208475d00fb2dd96d8b71 (patch) | |
| tree | 0a3b06a1e10b553dacb412e7be33465881110d70 /configure.ac | |
| parent | dfadeec9cd47ce9f71f4bba7bc80efda4f8fd94a (diff) | |
Fix last merge which broke configure.ac.
Also, remove generated configure.
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 |