gtk-css-engine r20 - in bzr-playground: . themes/Gilouche-CSS/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Mon Aug 18 13:51:00 2008
New Revision: 20
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=20&view=rev

Log:
Fix missed conflict.

Modified:
   bzr-playground/   (props changed)
   bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css

Modified: bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css
==============================================================================
--- bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css	(original)
+++ bzr-playground/themes/Gilouche-CSS/gtk-2.0/styles.css	Mon Aug 18 13:51:00 2008
@@ -85,17 +85,10 @@
 	background-color: green;
 }
 
-<<<<<<< TREE
 /* Seems like all boxes used all over the place*/
 box {
-	background-color: #fbf8f1;
-	border: 0px solid black;
-=======
-/* Seems like all boxes used all over the place*/
- box {
 	border: 0px solid black;
 	background-color: red;
->>>>>>> MERGE-SOURCE
 }
 
 /* A button*/