From 75dd6b552ab10c48eda4f282e9e69a91a10dfce5 Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Fri, 10 Jul 2020 19:41:07 +0200
Subject: [PATCH] Document Faust setup in Makefile.

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 6796329..2c74d2c 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,7 @@ FLAGS += -Idep/vult
 DEPS += $(vult)
 endif
 
+<<<<<<< HEAD
 # LibPD
 ifeq ($(LIBPD), 1)
 libpd := dep/lib/libpd.a
@@ -248,6 +249,9 @@ endif
 
 
 # Faust
+=======
+# Faust: compile the libfaust dynamic library with 'make world && sudo make install'
+>>>>>>> Document Faust setup in Makefile.
 ifeq ($(FAUST), 1)
 SOURCES += src/FaustEngine.cpp
 FLAGS += -I/use/local/include