fix

32feee92 · 张允禹 · 5159d3e0 · 32feee92
Commit 32feee92 authored Aug 12, 2016 by 张允禹
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

ascle.yaml ascle.yaml +0 -3

No files found.
--- a/ascle.yaml
+++ b/ascle.yaml
@@ -153,8 +153,6 @@ paths:
                image: 'http://hera.s.gmei.com/bulletin/2016/03/23/b3e00f8825'
                title: 我的第一个公告
                content_id: 2
-<<<<<<< ba9c38e85e9610870fde47c97414c9607f016596
-=======
              message: ''
              error: 0
              success: true
@@ -201,4 +199,3 @@ paths:
              error: 0
              success: true
              error_code: 0
->>>>>>> add order