From ddcd80630be3e48adddca2220d6bc5f825f941e5 Mon Sep 17 00:00:00 2001
From: Irina Boverman <iboverma(a)redhat.com>
Date: Tue, 28 Feb 2017 21:17:52 -0500
Subject: 0.17.0-1
---
qpid-proton.spec | 1 -
1 file changed, 1 deletion(-)
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 24fa554..fef3b53 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -397,7 +397,6 @@ popd
%endif
%changelog
-<<<<<<< HEAD
* Tue Feb 28 2017 Irina Boverman <iboverma(a)redhat.com> - 0.17.0-1
- Rebased to 0.17.0
- Renamed sub-packages qpid-proton-c-devel-docs/qpid-proton-cpp-devel-docs
--
cgit v1.1
https://src.fedoraproject.org/cgit/qpid-proton.git/commit/?h=epel7&id...