These are conflicts from master.

cal.scss deleted?
weblab · Feb 3, 2015 · 195ce34 · 195ce34
2 parents 6038ecd + 0b9a65c
commit 195ce34
Show file tree

Hide file tree

Showing 2 changed files with 355 additions and 0 deletions.
diff --git a/sass/cal.scss b/sass/cal.scss
@@ -85,9 +85,14 @@
 				opacity:.7;
 			}
 			th.today{
+<<<<<<< HEAD
 <<<<<<< HEAD
 				background: $uc-ecw-month-bg;
 				color: $uc-ecw-month-color;  
+=======
+				background: $uc-shortcal-today-bg;
+				color: $uc-shortcal-today-color;
+>>>>>>> 0b9a65cdbe3d11820b7f365de9f4b26ae22ed70d
 =======
 				background: $uc-shortcal-today-bg;
 				color: $uc-shortcal-today-color;