# HG changeset patch
# User wneuper
# Date 1110042536 -3600
# Node ID 30bb491cf9744f161243079674829c601ca93efb
# Parent  e8ca8094e459790e0a7ff811816ec6c4b3b46fb6
*** empty log message ***

diff -r e8ca8094e459 -r 30bb491cf974 src/sml/systest/auto-inform.sml
--- a/src/sml/systest/auto-inform.sml	Sat Mar 05 18:08:56 2005 +0100
+++ b/src/sml/systest/auto-inform.sml	Sat Mar 05 18:08:56 2005 +0100
@@ -2,7 +2,7 @@
    use"auto-inform.sml";
    *)
 
-"autoCalculate";
+"autoCalculate"; 
 "--------- solve_linear as rootpbl AUTOCALCULATE CompleteModel ---";
 "--------- solve_linear as rootpbl AUTOCALCULATE CompleteCalcHead-";
 "--------- maximum-example: complete_metitms ---------------------";
@@ -300,7 +300,6 @@
 "--------- appendFormula: on Frm + equ_nrls ----------------------";
 "--------- appendFormula: on Frm + equ_nrls ----------------------";
 "--------- appendFormula: on Frm + equ_nrls ----------------------";
-(**@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@**) 
  states:=[];
  CalcTree [(["equality (x+1=2)", "solveFor x","solutions L"], 
 	    ("Test.thy", 
@@ -313,7 +312,6 @@
  appendFormula 1 "2+ -1 + x = 2"; refFormula 1 (get_pos 1 1);
 
  moveDown 1 ([],Pbl); refFormula 1 ([1],Frm) (*x + 1 = 2*);
->>>>>>> 1.8
 
  moveDown 1 ([1  ],Frm); refFormula 1 ([1,1],Frm); 
  moveDown 1 ([1,1],Frm); refFormula 1 ([1,1],Res);