[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-289-g08a937f

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  08a937f30fd9d99b76e2f08fd04490c6260ae12e (commit)
      from  ab202b1a6835f6e7535ded0e77680d88e4d22b19 (commit)

Summary of changes:
 share/html/NoAuth/css/web2/misc.css |   28 ----------------------------
 1 files changed, 0 insertions(+), 28 deletions(-)

- Log -----------------------------------------------------------------
commit 08a937f30fd9d99b76e2f08fd04490c6260ae12e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Aug 11 14:54:14 2010 -0400

    Fix mismerge

diff --git a/share/html/NoAuth/css/web2/misc.css b/share/html/NoAuth/css/web2/misc.css
index acfa5b7..a1d15ff 100644
--- a/share/html/NoAuth/css/web2/misc.css
+++ b/share/html/NoAuth/css/web2/misc.css
@@ -46,35 +46,7 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 
-<<<<<<< HEAD
-#body.calpopup {
-    margin-left: 1em;
-    margin-top: 1em;
-} 
-
-#body.calpopup a.today {
-    font-size: 1em;
-    font-weight: bold;
-}
-
-#body.calpopup a {
-    font-size: 0.8em;
-}
-
-.calendar {
-    text-align: center;
-    margin: 0 0 0 0;
-}
-
-.calendar td, .calendar th { padding: 0.1em 0.1em 0.1em 0.1em; }
-
-.calendar caption .month {
-    padding: 0 0.25em 0 0.25em;
-    font-size: 1.5em;
-}
-=======
 @import "../base/misc.css";
->>>>>>> no-prototype
 
 .comment { 
  padding-left: 0.5em;

-----------------------------------------------------------------------