From dd17e4b6d37cb9657d6477fe81740ee0f15629f6 Mon Sep 17 00:00:00 2001 From: fakhri007 Date: Thu, 3 Dec 2020 10:43:53 +0700 Subject: [PATCH] [#9] resolve conflict --- doc/auth.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/auth.md b/doc/auth.md index 4fe1144..4368e5b 100644 --- a/doc/auth.md +++ b/doc/auth.md @@ -76,12 +76,8 @@ HTTP Code | Status | Description - password: required and not empty -<<<<<<< HEAD -*if any special logic, please write down the logic here* -======= *if any special logic, please write down the logic here. thanks* ->>>>>>> [#9] resolve conflict ### Scenario Test