From 23b42a48831b326a669c0e39c929375ee34635d9 Mon Sep 17 00:00:00 2001
From: Itamar Reis Peixoto <itamar@ispbrasil.com.br>
Date: Sun, 21 Nov 2010 00:42:51 -0200
Subject: [PATCH] fix mistake in Makefile.am

---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a65355e4..c50f207e 100644
--- 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 \