- fix cvs messup

Changed files:
    icedove.spec -> 1.51

diff --git a/icedove.spec b/icedove.spec
index d952e38802774406cf66f991ce81b89c472f9039..29280c154b3ba5e31595d494f58747199bfd9890 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -261,14 +261,9 @@ cd mailnews/extensions/enigmail
 
 %install
 rm -rf $RPM_BUILD_ROOT
-<<<<<<< icedove.spec
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_libdir}/icedove,%{_pixmapsdir},%{_desktopdir}} \
-       $RPM_BUILD_ROOT%{_datadir}/%{name}
-=======
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \
               $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
->>>>>>> 1.49
 
 cd comm-1.9.1
 %{__make} -C obj-%{_target_cpu}/mail/installer stage-package \