Removing the highlighting.

Author: nicksloan

css/style.css

@@ -451,7 +451,6 @@ table.schedule td.break {
 
 table.schedule td.registration {
     background-color: #fff48e;
-<<<<<<< HEAD
 }
 
 table.schedule tbody tr.highlight {
@@ -461,11 +460,5 @@ table.schedule tbody tr.highlight {
 table.schedule tr.highlight td.hour,
 table.schedule tr.highlight td.minute {
     background-color: transparent;
-=======
-}
-
-table.schedule tbody tr.highlight {
-    background-color: #99ffcc;
->>>>>>> d50c2d1bcca6da67073e09192ec7cc86de0a8962
 }
 

resources/schedule.html

@@ -45,7 +45,7 @@ <h1>PHP Community
                     <tr>
                         <td class="minute">45</td>
                     </tr>
-                    <tr class="highlight">
+                    <tr>
                         <td rowspan="4" class="hour">10</td>
                         <td class="minute">00</td>
                         <td rowspan="12">Lorna Mitchell - Web Services</td>
@@ -94,7 +94,7 @@ <h1>PHP Community
                     <tr>
                         <td class="minute">45</td>
                     </tr>
-                    <tr class="highlight">
+                    <tr>
                         <td rowspan="4" class="hour">13</td>
                         <td class="minute">00</td>
                         <td rowspan="4" colspan="2" class="lunch">Lunch</td>
@@ -122,16 +122,16 @@ <h1>PHP Community
                     <tr>
                         <td class="minute">15</td>
                     </tr>
-                    <tr class="highlight">
+                    <tr>
                         <td class="minute">30</td>
                         <td rowspan="3">Laura Beth Lincoln Denker - Is It
                             Handmade Code If You Use Power Tools?</td>
                         <td rowspan="3">Sean Coates - Gimme Bar</td>
                     </tr>
-                    <tr class="highlight">
+                    <tr>
                         <td class="minute">45</td>
                     </tr>
-                    <tr class="highlight">
+                    <tr>
                         <td rowspan="4" class="hour">15</td>
                         <td class="minute">00</td>
                     </tr>