fix mistake in Makefile.am

14 years ago · 23b42a4883
parent b06f72f3b9
commit 23b42a4883
1 changed files with 0 additions and 3 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,13 +1,10 @@
 EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt
-<<<<<<< HEAD

 if XRDP_FREERDP
 FREERDPDIR = freerdp
 else
 FREERDPDIR =
 endif
-=======
->>>>>>> 52cf642bcaaad68f1e82ebdd66778404d8f97412

 SUBDIRS = \
  common \