From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 test/Makefile.am |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 7442980..f8962fb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -9,5 +9,3 @@
 confusetest_PROGRAMS=confusetest
 confusetest_SOURCES=confusetest.c
 confusetest_LDFLAGS=-lconfuse
-co_PROGRAMS=co
-co_SOURCES=co.c ../src/sh.c ../src/general.c ../src/vesicle.c

--
Gitblit v1.9.3