From: Sung-Jin Park <sj76.park@samsung.com>
Date: Fri, 20 Oct 2017 04:38:18 +0000 (+0900)
Subject: tools: fix missing separator error in Makefile.am
X-Git-Tag: submit/tizen/20220208.100339~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82a820cf1d464e3de3b26cd376433e84aee180ca;p=platform%2Fupstream%2Flibevdev.git

tools: fix missing separator error in Makefile.am

Change-Id: I1fc676cea763b626cac4b31698f539f1265a6bd0
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ba714d5..12a4cab 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 noinst_PROGRAMS = libevdev-events \
 	       touchpad-edge-detector \
 	       mouse-dpi-tool \