1 files changed, 1 insertions, 15 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 894d3ae65..b6c70daea 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -30,12 +30,7 @@ credentials/keys/private_key.c credentials/keys/private_key.h \
 credentials/keys/public_key.c credentials/keys/public_key.h \
 credentials/keys/shared_key.c credentials/keys/shared_key.h \
 credentials/certificates/certificate.c credentials/certificates/certificate.h \
-<<<<<<< HEAD
-credentials/certificates/x509.h credentials/certificates/x509.c \
-credentials/certificates/ac.h \
-=======
 credentials/certificates/x509.h credentials/certificates/ac.h \
->>>>>>> upstream/4.5.1
 credentials/certificates/crl.h credentials/certificates/crl.c \
 credentials/certificates/pkcs10.h \
 credentials/certificates/ocsp_request.h \
@@ -51,7 +46,7 @@ credentials/sets/callback_cred.c credentials/sets/callback_cred.h \
 credentials/auth_cfg.c credentials/auth_cfg.h credentials/credential_set.h \
 credentials/cert_validator.h \
 database/database.h database/database_factory.h database/database_factory.c \
-fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
+fetcher/fetcher.h fetcher/fetcher.c fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
 eap/eap.h eap/eap.c \
 plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h \
 processing/jobs/job.h \
@@ -140,8 +135,6 @@ else
 SUBDIRS = .
 endif
 
-<<<<<<< HEAD
-=======
 if USE_AF_ALG
   SUBDIRS += plugins/af_alg
 if MONOLITHIC
@@ -149,7 +142,6 @@ if MONOLITHIC
 endif
 endif
 
->>>>>>> upstream/4.5.1
 if USE_AES
   SUBDIRS += plugins/aes
 if MONOLITHIC
@@ -241,8 +233,6 @@ if MONOLITHIC
 endif
 endif
 
-<<<<<<< HEAD
-=======
 if USE_CONSTRAINTS
   SUBDIRS += plugins/constraints
 if MONOLITHIC
@@ -250,7 +240,6 @@ if MONOLITHIC
 endif
 endif
 
->>>>>>> upstream/4.5.1
 if USE_PUBKEY
   SUBDIRS += plugins/pubkey
 if MONOLITHIC
@@ -293,8 +282,6 @@ if MONOLITHIC
 endif
 endif
 
-<<<<<<< HEAD
-=======
 if USE_SOUP
   SUBDIRS += plugins/soup
 if MONOLITHIC
@@ -302,7 +289,6 @@ if MONOLITHIC
 endif
 endif
 
->>>>>>> upstream/4.5.1
 if USE_LDAP
   SUBDIRS += plugins/ldap
 if MONOLITHIC