fix botched rebase

2019-03-28 15:42:06 -07:00 · 2019-03-28 15:42:06 -07:00 · 945569a29d
parent d21d96e35b
commit 945569a29d
1 changed files with 0 additions and 3 deletions
--- a/http/swagger.yml
+++ b/http/swagger.yml
@ -6556,12 +6556,9 @@ components:
            org:
              type: string
              format: uri
-<<<<<<< HEAD
-=======
            labels:
              type: string
              format: uri
->>>>>>> feat(http): add labels to variables
        id:
          readOnly: true
          type: string