projects
/
libradsec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't have generated file under source control.
[libradsec.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
570c5dd
..
3ff1cc3
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_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AC_PROG_CC