[mozilla-adblockplus/f21: 6/6] why the hell does this cause a conflict?

[Russell William Golden]

commit 47d3c3ead5fcf31189800c0235943b24724d1728
Merge: 870879f 868ecfc
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Wed Dec 10 13:42:59 2014 -0600

    why the hell does this cause a conflict?

 .gitignore               |    1 +
 mozilla-adblockplus.spec |   35 ++++++++++++++++++++++++++++++++---
 sources                  |    2 +-
 3 files changed, 34 insertions(+), 4 deletions(-)
---
diff --cc mozilla-adblockplus.spec
index b4f349a,4cd1fe3..91244c3
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@@ -14,8 -14,8 +14,13 @@@
  %define debug_package %{nil}
  
  Name:			mozilla-adblockplus
++<<<<<<< HEAD
 +Version:		2.6.4
 +Release:		3%{?dist}
++=======
+ Version:		2.6.6
+ Release:		1%{?dist}
++>>>>>>> master
  Summary:		Adblocking extension for Mozilla Firefox, Thunderbird, and SeaMonkey
  
  Group:			Applications/Internet
@@@ -108,9 -111,29 +116,30 @@@ rm -rf %{buildroot
  %{inst_dir}
  %{seamonkey_inst_dir}
  %{thunderbird_inst_dir}
 +%{_datadir}/appdata/*.metainfo.xml
  
+ # GNOME Software Center metadata
+ %if 0%{?fedora} >= 21
+ 	%{_datadir}/appdata/*.metainfo.xml
+ %endif
+ 
  %changelog
+ * Wed Dec 10 2014 Russell Golden <niveusluna at niveusluna.org> - 2.6.6-1
+ - spec file is again universal. Mr. Hughes apparently didn't notice that it was to begin with.
+ -2.6.5:
+ --Fixed: Element hiding exceptions are broken by changes in Firefox 34 and Firefox 35 (issue 1241, issue 1381).
+ --Fixed: Blocking via context menu won’t always suggest blocking the most recent request (issue 362).
+ --Fixed: Issue reporter will complain about too many filter lists even when these filter lists are “special”
+ ---like the anti-adblock list (issue 690).
+ --Fixed: Disabling filters via space bar no longer works in preferences (issue 1129).
+ --Fixed: Sharing Adblock Plus from the first-run page won’t work if the Anti-Social list is enabled (issue 1133).
+ --Fixed: Anti-Adblock warning will sometimes appear on websites without any anti-adblock behavior (issue 1161).
+ --Made $sitekey option behavior more consistent, it can be used similarly to $domain now rather than whitelisting
+ ---complete websites only (issue 432).
+ -
+ -2.6.6:
+ --Now works on Firefox nightly builds
+ 
  * Tue Aug 19 2014 Richard Hughes <richard at hughsie.com> - 2.6.4-3
  - Add a MetaInfo file for GNOME Software and Apper.