Fix merge conflict 16/222316/1 submit/tizen/20200113.120709 submit/tizen/20200114.015435
authorJi-hoon Lee <dalton.lee@samsung.com>
Mon, 13 Jan 2020 10:37:57 +0000 (19:37 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Mon, 13 Jan 2020 10:37:57 +0000 (19:37 +0900)
commit4c5f6eb851c5a6084ea727d3af3f6f71d1877f31
treebf92c071a547336599d9f667018060d4b1e99d27
parent2b6fc8a0b0240f8dae424fe7d2e2767081561eed
parent5d6ab45094b3f5b4fd9792b8a1b590ea5b0e467b
Fix merge conflict

Change-Id: I78689001e42615a2d4a72f496fc68e06070f91a7
packaging/multi-assistant.spec