[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes i... [rel_3_0]

[Antoine Farnault]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Antoine Farnault <toins>	06/11/02 09:26:26

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.9&r2=1.7.2.10

Patches:
Index: intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.7.2.9
retrieving revision 1.7.2.10
diff -u -b -r1.7.2.9 -r1.7.2.10
--- intranet.css	31 Oct 2006 16:42:16 -0000	1.7.2.9
+++ intranet.css	2 Nov 2006 09:26:26 -0000	1.7.2.10
@@ -267,7 +267,7 @@
 
 #onlinehelp {
     float:right;
-}=======
+}
 
 /* the design of the INactives tab buttons (all other tabs) */
 .tab_inactive {