Merge branch 'feature/refactor_v1' into tizen

author Inkyun Kil <inkyun.kil@samsung.com>

Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)

committer Inkyun Kil <inkyun.kil@samsung.com>

Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)
author Inkyun Kil <inkyun.kil@samsung.com>
Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)
committer Inkyun Kil <inkyun.kil@samsung.com>
Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)
diff --cc packaging/alarm-manager.spec

index e2d7a9b,beb1be2..53229cb

mode 100644,100755..100644
--- 1/packaging/alarm-manager.spec
--- 2/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
diff --cc server/alarm-service.conf.in

index 7ffdafd,157e415..7ffdafd

mode 100644,100755..100755
--- 1/alarm-service.conf.in
--- 2/server/alarm-service.conf.in
+++ b/server/alarm-service.conf.in
author	Inkyun Kil <inkyun.kil@samsung.com>
	Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)
committer	Inkyun Kil <inkyun.kil@samsung.com>
	Fri, 18 Oct 2019 01:56:19 +0000 (10:56 +0900)
		1	2
packaging/alarm-manager.spec	patch \|	diff1 \|	diff2 \|	blob \| history
server/alarm-service.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history