Correcting the file to stop the error reports mj has been receiving.

db- · db- · commit 48fae830b552 · 2016-08-23T09:38:03.000-04:00
diff --git a/archive/entries/2016-08-22-1.xml b/archive/entries/2016-08-22-1.xml
@@ -31,4 +31,3 @@
     </div>
   </content>
 </entry>
->>>>>>> pull-request/119
