summaryrefslogtreecommitdiff
path: root/2.3-1/etc
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/etc')
-rw-r--r--2.3-1/etc/scilab2c.start6
1 files changed, 1 insertions, 5 deletions
diff --git a/2.3-1/etc/scilab2c.start b/2.3-1/etc/scilab2c.start
index 2b10a581..ff243e98 100644
--- a/2.3-1/etc/scilab2c.start
+++ b/2.3-1/etc/scilab2c.start
@@ -53,14 +53,10 @@ end
// =============================================================================
if or(getscilabmode() == ["NW";"STD"]) then
- mprintf("\tLoad demos\n");
+ mprintf("\tLoad demos\n");
pathdemos = pathconvert(root_tlbx + "/demos/scilab2c.dem.gateway.sce",%f,%t);
-<<<<<<< HEAD
-// add_demo(gettext("Scilab2C"),pathdemos);
-=======
add_demo(gettext("Scilab2C"),pathdemos);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
clear pathdemos ;
end