Fix wrong merge after https://codereview.scilab.org/#/c/14534/ 43/14543/1
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 19 May 2014 15:13:48 +0000 (17:13 +0200)
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>
Mon, 19 May 2014 15:13:48 +0000 (17:13 +0200)
commit85287133b9e4fdbfb4b77667700674e6cf092ec1
tree995c151faec76e8561c9a248e80fe25326591f91
parent4877433b5d096a1c8e0e58b67d9ca556c4270e51
Fix wrong merge after https://codereview.scilab.org/#/c/14534/

Change-Id: I57fa4cbd2cc0f94769c9c79ea83290fdba2cb183
scilab/modules/external_objects_java/help/ja_JP/jdisableTrace.xml