Index: openacs-4/contrib/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/www/Attic/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/simulation/www/index.adp	17 Oct 2003 11:11:25 -0000	1.8
+++ openacs-4/contrib/packages/simulation/www/index.adp	21 Oct 2003 12:53:50 -0000	1.9
@@ -60,7 +60,6 @@
 <li><a href="sim-template-list">20 templates</a>
 </ul>
 <hr>
-<<<<<<< index.adp
 <div class="notloggedin">
 <h3>If not logged in:</h3>
 Sieberdam currently has 
Index: openacs-4/packages/simulation/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/simulation/www/index.adp	17 Oct 2003 11:11:25 -0000	1.8
+++ openacs-4/packages/simulation/www/index.adp	21 Oct 2003 12:53:50 -0000	1.9
@@ -60,7 +60,6 @@
 <li><a href="sim-template-list">20 templates</a>
 </ul>
 <hr>
-<<<<<<< index.adp
 <div class="notloggedin">
 <h3>If not logged in:</h3>
 Sieberdam currently has