[owncloud-csync/f17] Update to 0.60.4

[Joseph Marrero]

commit 553a7bbe64269eae1700f2fea16c98aa61c841df
Author: Joseph Marrero <jmarrero at fedoraproject.org>
Date:   Thu Dec 20 21:52:06 2012 -0400

    Update to 0.60.4

 owncloud-csync.spec |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/owncloud-csync.spec b/owncloud-csync.spec
index a3eed22..3144c62 100644
--- a/owncloud-csync.spec
+++ b/owncloud-csync.spec
@@ -1,11 +1,6 @@
 Name:           owncloud-csync
-<<<<<<< HEAD
-Version:        0.60.1
-Release:        1%{?dist}
-=======
 Version:        0.60.4
-Release:        2%{?dist}
->>>>>>> master
+Release:        1%{?dist}
 Summary:        A user level bidirectional client only file synchronizer
 License:        GPLv2+
 Url:            http://owncloud.org/sync-clients/
@@ -152,20 +147,11 @@ popd build
 %{_docdir}/%{name}-%{version}
 
 %changelog
-<<<<<<< HEAD
-* Fri Oct 19 2012 <jmarrero at fedoraproject.org> 0.60.1-1
-- Version update to 0.60.1
-=======
-* Thu Dec 20 2012 <jmarrero at fedoraproject.org> 0.60.4-2
-- fix changelog dates
 * Thu Dec 20 2012 <jmarrero at fedoraproject.org> 0.60.4-1
-- Version upgrade to 0.60.4
-* Tue Dec 04 2012 <jmarrero at fedoraproject.org> 0.60.3-1
-- Version upgrade to 0.60.3
-- added dep requirement logc-dev
+- update to 0.60.4 on f17 for mirall 1.1.4
+- fix changelog
 * Fri Oct 19 2012 <jmarrero at fedoraproject.org> 0.60.1-1
-- Version upgrade to 0.60.1 
->>>>>>> master
+- Version update to 0.60.1
 * Sun Oct 14 2012 <jmarrero at fedoraproject.org> 0.60.0-1
 - Version bump to 0.60.0
 - removed renaming patches as uptream has renamed to ocsync