Fix a merge d'oh

Juris-M · Mar 21, 2019 · 4f79aaa · 4f79aaa
1 parent 422dad9
commit 4f79aaa
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/install.rdf b/install.rdf
@@ -3,8 +3,6 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
   <Description about="urn:mozilla:install-manifest">
-
-<<<<<<< HEAD
     <em:id>juris-m@juris-m.github.io</em:id>
     <em:name>Juris-M</em:name>
     <em:version>5.0.65m44.SOURCE</em:version>