Remove stray >>>>>

This commit is contained in:
Colton Myers 2015-05-26 15:51:56 -06:00
parent 7dfbd929ff
commit e52b5ab2e2

View file

@ -194,7 +194,6 @@ Thu Jan 15 17:50:52 UTC 2015 - aboe76@gmail.com
- Added man salt.7.gz to salt-master package
-------------------------------------------------------------------
>>>>>>> updated suse spec file to version 2015.5.0
Mon Nov 3 21:35:31 UTC 2014 - aboe76@gmail.com
- Updated to Major Release 2014.7.0