diff options
Diffstat (limited to 'help/en_US/scilab_en_US_help/jhelpmap.jhm')
| -rw-r--r-- | help/en_US/scilab_en_US_help/jhelpmap.jhm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index f11b764..f8e4965 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -2,11 +2,7 @@ <!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd"> <map version="1.0"> <mapID target="index" url="index.html"/> -<<<<<<< HEAD <mapID target="section_5118e822ecc2888aa80042108de4932e" url="section_5118e822ecc2888aa80042108de4932e.html"/> -======= -<mapID target="section_cc2bc01c47967d47fcf3507a91d572ba" url="section_cc2bc01c47967d47fcf3507a91d572ba.html"/> ->>>>>>> 3f916032cc0b2efdeafb838dd10e1141ead2cb27 <mapID target="ac2poly" url="ac2poly.html"/> <mapID target="ac2rc" url="ac2rc.html"/> <mapID target="arParEst" url="arParEst.html"/> |