[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes i... [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Thu Nov 2 14:33:53 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/11/02 13:33:53
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css
Log message:
fix a cvs conflit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.10&r2=1.7.2.11
Patches:
Index: intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.7.2.10
retrieving revision 1.7.2.11
diff -u -b -r1.7.2.10 -r1.7.2.11
--- intranet.css 2 Nov 2006 09:26:26 -0000 1.7.2.10
+++ intranet.css 2 Nov 2006 13:33:53 -0000 1.7.2.11
@@ -310,5 +310,3 @@
height:0px; /* you propably don't need to change this one */
visibility:visible; /* you propably don't need to change this one */
}
-
->>>>>>> 1.7.2.8
More information about the Koha-cvs
mailing list