Fix wrong merge after https://codereview.scilab.org/#/c/14534/ 43/14543/1
Vincent COUVERT [Mon, 19 May 2014 15:13:48 +0000 (17:13 +0200)]
Change-Id: I57fa4cbd2cc0f94769c9c79ea83290fdba2cb183

scilab/modules/external_objects_java/help/ja_JP/jdisableTrace.xml

index 9fc1153..a2a2329 100644 (file)
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
-
-=======
->>>>>>> 8f371f0... japanese translation updated.
 <!--
 *
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
         </para>
     </refsection>
     <refsection>
-<<<<<<< HEAD
-        
-        <title>Examples</title>
-        
-=======
         <title>δΎ‹</title>
->>>>>>> 8f371f0... japanese translation updated.
         <programlisting role="example"><![CDATA[
                jenableTrace(fullpath(TMPDIR + "/../debug_jims.log"));
                // ...