fixed merge marker error #3

Closed

Joel wants to merge 3 commits from bug/merge-marker into joel-plutio

pull from: bug/merge-marker

merge into: Chykalophia:joel-plutio

Chykalophia:master

Chykalophia:enhancement/add-company-people-api-endpoints

Chykalophia:enhancement/adding-followers-function

Conversation 0 Commits 3 Files changed 1 +6 -6

3 commits

Author	SHA1	Message	Date
joel	99addde632	fixing merge conflict	2022-09-15 00:58:36 +08:00
joel	30bf56d941	merge conflict	2022-09-15 00:55:06 +08:00
joel	c6ef0dd966	fixed merge marker error	2022-09-15 00:50:03 +08:00