Update missing_images.php

Removed extraneous commit information
retched · Jul 24, 2014 · 82f0ef8 · 82f0ef8
1 parent 3106799
commit 82f0ef8
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/missing_images.php b/missing_images.php
@@ -1,11 +1,7 @@
 <?php 
 /**
  * Missing Images Checker for ZenCart
-<<<<<<< HEAD
  * Version 1.0.2
-=======
- * Version 1.0.1
->>>>>>> origin/master
  * By Paul Williams (retched) 
  * @copyright Portions Copyright 2004-2006 Zen Cart Team
 ****************************************************************************
@@ -413,11 +409,7 @@
 </style>
 </head>
 <body>
-<<<<<<< HEAD
 <p class="centeredText"><span class="documentHeadline">Missing Image Checker for ZenCart v1.0.2</span></p>
-=======
-<p class="centeredText"><span class="documentHeadline">Missing Image Checker for ZenCart v1.0.1</span></p>
->>>>>>> origin/master
 <?php if (sizeof($products_info) > 0) { ?>
 <table class="resultsTable" >
   <tr class="headingRow">