Fix merge conflict 19/208419/3 accepted/tizen/unified/20190624.115329 submit/tizen/20190624.074820
authorSeonah Moon <seonah1.moon@samsung.com>
Mon, 24 Jun 2019 06:49:05 +0000 (15:49 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Mon, 24 Jun 2019 07:41:17 +0000 (16:41 +0900)
commit8f22beb5294529625d3772db819f9c01df00953d
tree49db9a4377536a86c5a4885fca58150d936fda4d
parent074c6b1517c3a4c5c9f918e821cd54aeeb3c9330
Fix merge conflict

Change-Id: Ib014b55edb95b0eafde42b3e39d17ff5929bf1ce
provider/download-provider-client-manager.c
provider/download-provider-client.c
provider/download-provider-main.c
provider/download-provider-network.c
provider/download-provider-notification-manager.c
provider/download-provider-notification.c