diff options
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 0 insertions, 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 \ |