[bzr/f19] Conditionally add -fno-strict-aliasing to CFLAGS

[Toshio くらとみ]

commit 60a0596be5921889771c059b6cf7ea3ace0b9ff3
Author: Ondrej Oprala <ooprala at redhat.com>
Date:   Tue May 28 14:22:11 2013 +0200

    Conditionally add -fno-strict-aliasing to CFLAGS

 bzr.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/bzr.spec b/bzr.spec
index 566dab0..2d45312 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -153,10 +153,6 @@ rm -rf $RPM_BUILD_ROOT
 - Add gettext to BuildRequires
 
 * Mon May 27 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-8
-- Add gettext to BuildRequires
-
-* Mon May 27 2013 Ondrej Oprala <ooprala at redhat.com> 2.5.1-8
->>>>>>> Add gettext to BuildRequires
 - Fix conditional include of python-paramiko
 
 * Fri May 24 2013 Ondrej Oprala <ooprala at redhat.com> - 2.5.1-7