[autofs/f22] - fix spec file conflict.

[Ian Kent]

commit 15d1671f600b9e0e7d0db3c2e5e440459a566778
Author: Ian Kent <raven at themaw.net>
Date:   Mon Mar 23 21:12:23 2015 +0800

    - fix spec file conflict.

 autofs.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/autofs.spec b/autofs.spec
index bcedc1e..6af0985 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -247,14 +247,11 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
-<<<<<<< HEAD
 * Mon Mar 23 2015 Ian Kent <ikent at redhat.com> - 1:5.1.0-12
-- Drop ancient 2.6 kernel patches from docs (pbrobinson at fedoraproject.org).
 - fix gcc5 complaints (bz1204685).
-=======
+
 * Mon Mar 23 2015 Peter Robinson <pbrobinson at fedoraproject.org> 1:5.1.0-11
 - Drop ancient 2.6 kernel patches from docs
->>>>>>> 1d5fd61536b1f0a58bef5236ceb1caf462fcef7c
 
 * Wed Jan 21 2015 Ian Kent <ikent at redhat.com> - 1:5.1.0-10
 - make negative cache update consistent for all lookup modules.