From 3d84a1922670588971a2dc8dc5900f87b45a580b Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Fri, 8 May 2009 15:04:59 +0000
Subject: [PATCH] update a comment + resolve conflicts.
---
web/user_doc/styles.shtml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/user_doc/styles.shtml b/web/user_doc/styles.shtml
index c167f3700..096858099 100755
--- a/web/user_doc/styles.shtml
+++ b/web/user_doc/styles.shtml
@@ -4,7 +4,7 @@
<!--#set var="author" value="edgrif@sanger.ac.uk" -->
<!-- Start of page. -->
-<!-- CVS info: $Id: styles.shtml,v 1.10 2009-05-08 13:08:44 rds Exp $ -->
+<!-- CVS info: $Id: styles.shtml,v 1.11 2009-05-08 15:04:59 edgrif Exp $ -->
<style>
pre{ width: 95%; background-color: #DDDDDD; border-style: solid; border-width: 1px; padding: 10px }
@@ -855,7 +855,7 @@ be copied and pasted direct into a models.wrm file.
<h4>The ?ZMap_style Class</h4>
-<!-- models included here (see acedb server directory)-->
+<!-- models included here (see zmapsServer/acedb directory)-->
<pre class="example">
<!--#include virtual="models.wrm.shtml"-->
</pre>
--
GitLab