Skip to content

Instantly share code, notes, and snippets.

@nataliepo

nataliepo/masthead.diff

Created February 18, 2011 16:51
Show Gist options
  • Save nataliepo/833972 to your computer and use it in GitHub Desktop.
Save nataliepo/833972 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
masthead.diff
<<<<<<< HEAD
<td class="drinks-sub"><label for="flyout-19"><input type="checkbox" id="flyout-19" name="category" value="non-alcoholic" /> Non-Alcoholic</label></td>
=======
<td class="drinks-sub"><label for="flyout-19"><input type="checkbox" id="flyout-19" name="category" value="homebrewing" /> Homebrewing</label></td>
>>>>>>> checking in the latest staging templates.
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><label for="flyout-20"><input type="checkbox" id="flyout-20" name="category" value="cheese" /> Cheese</label></td>
<<<<<<< HEAD
<td class="drinks-sub"><label for="flyout-21"><input type="checkbox" id="flyout-21" name="category" value="other_drinks" /> Other Drinks</label></td>
=======
<td class="drinks-sub"><label for="flyout-21"><input type="checkbox" id="flyout-21" name="category" value="non-alcoholic" /> Non-Alcoholic</label></td>
>>>>>>> checking in the latest staging templates.
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><label for="flyout-22"><input type="checkbox" id="flyout-22" name="category" value="seafood" /> Seafood</label></td>
<<<<<<< HEAD
<td><label for="flyout-23"><input type="checkbox" id="flyout-23" name="category" value="salads" /> Salads</label</td>
=======
<td class="drinks-sub"><label for="flyout-23"><input type="checkbox" id="flyout-23" name="category" value="other-drinks" /> Other Drinks</label></td>
>>>>>>> checking in the latest staging templates.
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td><label for="flyout-24"><input type="checkbox" id="flyout-24" name="category" value="pasta-and-grains" /> Pasta and Grains</label></td>
<<<<<<< HEAD
<td><label for="flyout-25"><input type="checkbox" id="flyout-25" name="category" value="sandwiches" /> Sandwiches</label></td>
=======
<td><label for="flyout-25"><input type="checkbox" id="flyout-25" name="category" value="salads" /> Salads</label></td>
>>>>>>> checking in the latest staging templates.
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
<<<<<<< HEAD
<td><label for="flyout-26"><input type="checkbox" id="flyout-26" name="category" value="soups" /> Soups</label></td>
=======
<td><label for="flyout-26"><input type="checkbox" id="flyout-26" name="category" value="sandwiches" /> Sandwiches</label></td>
<td>&nbsp;</td>
</tr>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment