Resolved merge conflict in src/Makefile.am

diff --cc src/Makefile.am
index c9b1cf2,ba6837c..9988245
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,7 -1,7 +1,9 @@@
  lib_LTLIBRARIES = libACL.la
  
  libACL_la_SOURCES = string.cpp regex.cpp date.cpp parsedate.c dateyacc.y datelex.c \
 -                    hour.cpp utc.cpp
 +                    hour.cpp utc.cpp \
 +                    Integer.cpp
 +
+ libACL_la_LDFLAGS = -version-info 0:2:0
+ 
 -include_HEADERS = String.h date.h
 +include_HEADERS = String.h date.h Integer.h