Fix merge conflict

Change-Id: I78689001e42615a2d4a72f496fc68e06070f91a7

diff --cc packaging/multi-assistant.spec
index 67708812a346d28a9a512acde7f79c2666e2a79d,0a4a5c35b14967228b4081443efd5861ab90978d..3e72fb7ad896b26bfe76c6c30348f1afbf29d954
--- 1/packaging/multi-assistant.spec
--- 2/packaging/multi-assistant.spec
+++ b/packaging/multi-assistant.spec
@@@ -72,9 -72,7 +72,9 @@@ export FFLAGS+=" -fprofile-arcs -ftest-
  export LDFLAGS+=" -lgcov"
  %endif
  
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
 +export CFLAGS+=" -Wno-stringop-overflow -Wno-format-overflow -Wno-format-truncation -Wno-stringop-truncation"
 +export CXXFLAGS+=" -Wno-stringop-overflow -Wno-format-overflow -Wno-format-truncation -Wno-stringop-truncation"
+ %cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \
          -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN
  make %{?jobs:-j%jobs}