[#9] resolve conflict

cdcgi · Dec 3, 2020 · 648650f · 648650f
1 parent 9fc7dd5
commit 648650f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/doc/auth.md b/doc/auth.md
@@ -75,9 +75,13 @@ HTTP Code | Status | Description
 - username : required and not empty
 - password: required and not empty
 
+<<<<<<< HEAD
 
 *if any special logic, please write down the logic here. thanks*
 
+=======
+*if any special logic, please write down the logic here. thanks*
+>>>>>>> [#9] resolve conflict
 
 ### Scenario Test