From: syeon.hwang <syeon.hwang@samsung.com>
Date: Wed, 1 Aug 2012 07:12:59 +0000 (+0900)
Subject: [Title] Fix grammar error on build.xml
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1528^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdcf15f4f25fc763363cfc664a6df179e8398440;p=sdk%2Femulator%2Fqemu.git

[Title] Fix grammar error on build.xml
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 50c6b00143..c9439053d7 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>