projects / platform / upstream / libevdev.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f58509e)
tools: fix missing separator error in Makefile.am
authorSung-Jin Park <sj76.park@samsung.com>
Fri, 20 Oct 2017 04:38:18 +0000 (13:38 +0900)
committerjeon <jhyuni.kang@samsung.com>
Wed, 12 Feb 2020 08:10:29 +0000 (17:10 +0900)
Change-Id: I1fc676cea763b626cac4b31698f539f1265a6bd0
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>
tools/Makefile.am patch | blob | history

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 768dffbf84b7e3195777577941882108084ebca2..6e96dc56ef451c1f7ee069aaa46298859e9de850 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 noinst_PROGRAMS = libevdev-events \
               touchpad-edge-detector \
               mouse-dpi-tool \
Domain: Graphics System / Input Management;