[#9] bring back acl-layer

cdcgi · Dec 10, 2020 · b07f726 · b07f726
1 parent 61f7ed4
commit b07f726
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/doc/acl-layer.png b/doc/acl-layer.png
diff --git a/doc/auth.md b/doc/auth.md
@@ -76,11 +76,8 @@ HTTP Code | Status | Description
 - password: required and not empty
 
 *if any special logic, please write down the logic here. thanks*
-<<<<<<< HEAD
 
 
-=======
->>>>>>> [#9] add documentation