Fixing minor issue w/ site map vs git

extjs · Jun 25, 2012 · 1235cb5 · 1235cb5
1 parent a519029
commit 1235cb5
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/taxonomy_category.xml b/taxonomy_category.xml
@@ -11,24 +11,14 @@
         <priority>0.6</priority>
     </url>
     <url>
-<<<<<<< HEAD
-        <loc>http://try.sencha.com/tags/Ext_JS_4_1_0/</loc>
-        <lastmod>2012-06-22</lastmod>
-=======
         <loc>http://try.sencha.com/tags/Ext_JS_4.1.0/</loc>
         <lastmod>2012-06-25</lastmod>
->>>>>>> Updated the about.html pages to include Github links
         <changefreq>weekly</changefreq>
         <priority>0.5</priority>
     </url>
     <url>
-<<<<<<< HEAD
-        <loc>http://try.sencha.com/tags/Ext_JS_4_0_7/</loc>
-        <lastmod>2012-06-22</lastmod>
-=======
         <loc>http://try.sencha.com/tags/Ext_JS_4.0.7/</loc>
         <lastmod>2012-06-25</lastmod>
->>>>>>> Updated the about.html pages to include Github links
         <changefreq>weekly</changefreq>
         <priority>0.5</priority>
     </url>
@@ -39,24 +29,14 @@
         <priority>0.6</priority>
     </url>
     <url>
-<<<<<<< HEAD
-        <loc>http://try.sencha.com/tags/Sencha_Touch_2_0_1/</loc>
-        <lastmod>2012-06-22</lastmod>
-=======
         <loc>http://try.sencha.com/tags/Sencha_Touch_2.0.1/</loc>
         <lastmod>2012-06-25</lastmod>
->>>>>>> Updated the about.html pages to include Github links
         <changefreq>weekly</changefreq>
         <priority>0.5</priority>
     </url>
     <url>
-<<<<<<< HEAD
-        <loc>http://try.sencha.com/tags/Sencha_Touch_2_0_0/</loc>
-        <lastmod>2012-06-22</lastmod>
-=======
         <loc>http://try.sencha.com/tags/Sencha_Touch_2.0.0/</loc>
         <lastmod>2012-06-25</lastmod>
->>>>>>> Updated the about.html pages to include Github links
         <changefreq>weekly</changefreq>
         <priority>0.5</priority>
     </url>