You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ja...@apache.org on 2010/02/25 01:59:53 UTC
svn commit: r916071 - /shindig/trunk/javascript/container/gadgets.css
Author: jasvir
Date: Thu Feb 25 00:59:53 2010
New Revision: 916071
URL: http://svn.apache.org/viewvc?rev=916071&view=rev
Log:
Fix merge conflict. Thanks to Chirag Shah for catching it.
Modified:
shindig/trunk/javascript/container/gadgets.css
Modified: shindig/trunk/javascript/container/gadgets.css
URL: http://svn.apache.org/viewvc/shindig/trunk/javascript/container/gadgets.css?rev=916071&r1=916070&r2=916071&view=diff
==============================================================================
--- shindig/trunk/javascript/container/gadgets.css (original)
+++ shindig/trunk/javascript/container/gadgets.css Thu Feb 25 00:59:53 2010
@@ -59,15 +59,8 @@
.gadgets-log-entry {
}
-<<<<<<< .mine
-
-.gadgets-messages {
-
-}
-=======
// Used to style messages produced during rewriting by CajaContentRewriter
.gadgets-messages {
}
->>>>>>> .r916014