[apr-api-docs: 3/3] Bump up to 1.4.6.

[bojan]

commit def81ba6766de44343bdeda826bef5363208bf59
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Sun Mar 4 18:19:40 2012 +1100

    Bump up to 1.4.6.

 apr-api-docs.spec |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/apr-api-docs.spec b/apr-api-docs.spec
index 2986084..16bb9f7 100644
--- a/apr-api-docs.spec
+++ b/apr-api-docs.spec
@@ -1,11 +1,6 @@
 Name:           apr-api-docs
-<<<<<<< HEAD
 Version:        1.4.6
 Release:        1%{?dist}
-=======
-Version:        1.4.5
-Release:        2%{?dist}
->>>>>>> 539090431a4eef14e267b042095d6d7153068e62
 Summary:        Apache Portable Runtime API documentation
 
 Group:          Development/Tools
@@ -65,13 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/apr-%{version}/api-docs/*
 
 %changelog
-<<<<<<< HEAD
 * Sun Mar  4 2012 Bojan Smojver <bojan at rexursive.com> 1.4.6-1
 - Bump up to 1.4.6
-=======
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
->>>>>>> 539090431a4eef14e267b042095d6d7153068e62
 
 * Sat May 21 2011 Bojan Smojver <bojan at rexursive.com> 1.4.5-1
 - Bump up to 1.4.5