[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 50c6b00143d796b1533c400ad51de42326b8f27c..c9439053d7c4c57e1c1e230d6c23565d7864569e 100644 (file)
--- 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>