[ecore] Update to 1.8.2

[Dan Mashal]

commit 7de329153d0765d9b0d0c16270380bbed47ffbd6
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Aug 18 01:06:50 2013 -0700

    Update to 1.8.2

 ecore.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/ecore.spec b/ecore.spec
index 6832838..27b0dc9 100644
--- a/ecore.spec
+++ b/ecore.spec
@@ -34,7 +34,6 @@ developing applications that use %{name}.
 %setup -q -n %{name}-%{version}
 
 %build
-<<<<<<< HEAD
 %configure                                    \
            --disable-static                   \
            --enable-ecore-fb                  \
@@ -104,7 +103,6 @@ mv %{buildroot}%{_mandir}/man3/Examples.3 %{buildroot}%{_mandir}/man3/ecore-Exam
 - tighten build deps to ensure ecore-evas component builds
 - -devel drop explicit deps, automatic pkgconfig deps catch those already
 - %%build: --disable-silent-rules
->>>>>>> c4ba9ce29484797d06564a46e729017b0d81ecaf
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild