remove git merge conflict messages

fedora-infra · May 29, 2015 · 0c49dde · 0c49dde
1 parent 8125571
commit 0c49dde
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/files/mote.spec b/files/mote.spec
@@ -94,17 +94,12 @@ ln -s /usr/share/fonts/fontawesome %{buildroot}/%{python_sitelib}/mote/static/fo
 %{python_sitelib}/mote*.egg-info
 
 %changelog
-<<<<<<< HEAD
 * Thu May 26 2015 Chaoyi Zha <[email protected]> - 0.0.5b1
 - Update 0.0.5 Beta 1
 - Remove bundled fontawesome fonts, symlink to appropriate font
 - Clean up RPM spec, fix issues
-* Tue May 26 2015 Chaoyi Zha <[email protected]> - 0.0.4b1
-- Update 0.0.4 Beta 1
-=======
-* Tue May 26 2015 Chaoyi Zha <[email protected]>
+* Tue May 26 2015 Chaoyi Zha <[email protected]> - 0.0.4b2
 - Update 0.0.4 Beta 2
->>>>>>> a1a18f28d096542fa77d24bab5d679b39553cff6
 - Migrate to python-memcached from pylibmc
 * Sat May 23 2015 Chaoyi Zha <[email protected]> - 0.0.3b1
 - Update 0.0.3 Beta 1