From cdcf15f4f25fc763363cfc664a6df179e8398440 Mon Sep 17 00:00:00 2001
From: "syeon.hwang" <syeon.hwang@samsung.com>
Date: Wed, 1 Aug 2012 16:12:59 +0900
Subject: [PATCH] [Title] Fix grammar error on build.xml [Type] [Module]
 [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase]

---
 tizen/src/skin/client/build.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 50c6b00..c943905 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -106,11 +106,7 @@
 			<arg line="Share.c" />
 			<arg line="-o" />
 			<arg line="libshare.dylib" />
-<<<<<<< HEAD
 			<arg line="-I${env.JAVA_JNI_H_INCLUDE_PATH}" />
-=======
-			<arg line="-I${env.JAVA_HOME}/../Headers" />
->>>>>>> c82a28fbb7e784e38e8536466461ef35ab766688
 			<arg line="-fPIC" />
 		</exec>
 		<delete>
-- 
2.7.4