fix(i18n)

2014-04-15 17:56:54 +02:00
parent ddf5ad8ec9
commit 93ca6cf693
1 changed files with 0 additions and 4 deletions
@@ -456,12 +456,8 @@ module.exports = (swagger, v2) ->
      spec:
        path: "/groups/{gid}/chat"
        description: "Get all chat messages"
-<<<<<<< HEAD
        parameters: [path('gid','Group to return the chat from ','string')]
-      middleware: [auth.auth, groups.attachGroup]
-=======
      middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup]
->>>>>>> refactor(i18n): refactor user language detection, add to api methods
      action: groups.getChat