Commit 04bfe0f9 authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve merge conflict

parents 3479c2dc b6f5b0b5

etsi-mec-sandbox-frontend @ 8e86af28

Compare 14e4658a to 8e86af28
Original line number Diff line number Diff line 
Subproject commit 14e4658a805a66b5dd2528c77806f3199a500690
 
Subproject commit 8e86af28269336ea0552508884d12203fc70cddf

go-packages/meep-sss-mgr/http.go

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ func (http_mgr *SssMgrHttp) init(tm *SssMgr, notify func(map[string]interface{}) 
			notificationServerStarted = false

			return

		}



		log.Info("<<< Init: Terminating OneM2M Notification server")

		notificationServerStarted = false

	}()