projects / platform / core / connectivity / mdg-manager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8393b5b) | patch
Reslove merge confilct issue.
authorsaerome.kim <saerome.kim@samsung.com>
Tue, 3 Jul 2018 01:46:17 +0000 (10:46 +0900)
committersaerome.kim <saerome.kim@samsung.com>
Tue, 3 Jul 2018 01:46:17 +0000 (10:46 +0900)
commit57a72c784f283201a950ebf4369bca0177fa7ec5
tree3226c4479c6b1d237926efa9dcf88e106abc5e9ctree | snapshot
parent8393b5b4258ad7637b3658a323b7824c37ae84e8commit | diff
Reslove merge confilct issue.

Modification of the "merge confilt" problem caused by the combination of
github temporal git and public 'mdg-manager' git.

Change-Id: Ia6cc69f0bb8f80bf772912da4467ebacc6f916ff
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
src/mdg-manager/src/mdgd_iot.cpp diff | blob | history
Domain: Network & Connectivity / Common;