fix conflicts
authorSeonah Moon <seonah1.moon@samsung.com>
Tue, 18 Feb 2020 07:51:29 +0000 (16:51 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Tue, 18 Feb 2020 07:51:29 +0000 (16:51 +0900)
commit22c6e1947d6b75a774c3cf1f26536d62ca2d187f
treebecc6d9e8cdf8818d782243fc59a57d43b295f9d
parentbc3d51e8ad2ede2018b1ad0620eb4bf4011772ea
parent35ba8bf2d0e5f50acceedbddc9be84a00bf9b8d1
fix conflicts
include/wifi-aware.h
src/include/wifi-aware-gdbus.h
src/include/wifi-aware-private.h
src/wifi-aware-gdbus.c
src/wifi-aware-private.c
src/wifi-aware.c
test/wifi-aware-test.c