From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Mon, 13 Jan 2020 10:37:57 +0000 (+0900)
Subject: Fix merge conflict
X-Git-Tag: submit/tizen/20200113.120709^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c5f6eb851c5a6084ea727d3af3f6f71d1877f31;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git

Fix merge conflict

Change-Id: I78689001e42615a2d4a72f496fc68e06070f91a7
---

4c5f6eb851c5a6084ea727d3af3f6f71d1877f31
diff --cc packaging/multi-assistant.spec
index 6770881,0a4a5c3..3e72fb7
--- a/packaging/multi-assistant.spec
+++ b/packaging/multi-assistant.spec
@@@ -72,9 -72,7 +72,9 @@@ export FFLAGS+=" -fprofile-arcs -ftest-
  export LDFLAGS+=" -lgcov"
  %endif
  
 +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} \
+ %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}