)]}'
{
  "commit": "7745d7ed44c8e978c04cb44e22255342131e24ad",
  "tree": "b84dd4380a85038604a048fefc3a05ba5b26a90c",
  "parents": [
    "a76ed24194a8b8504160d5620a49318b489ed4b2",
    "f78a6c6a47ed46217b8813a8c7b7845dcfb1574b"
  ],
  "author": {
    "name": "margaretha",
    "email": "margaretha@ids-mannheim.de",
    "time": "Wed May 24 19:00:47 2017 +0200"
  },
  "committer": {
    "name": "margaretha",
    "email": "margaretha@ids-mannheim.de",
    "time": "Wed May 24 19:02:26 2017 +0200"
  },
  "message": "Merge remote-tracking branch \u0027origin/master\u0027 into new-index\n\nConflicts:\n\tsrc/main/java/de/ids_mannheim/korap/resource/rewrite/CollectionRewrite.java\n\tsrc/main/java/de/ids_mannheim/korap/security/auth/KustvaktAuthenticationManager.java\n\tsrc/main/java/de/ids_mannheim/korap/user/User.java\n\tsrc/main/java/de/ids_mannheim/korap/web/service/full/ResourceService.java\n\nChange-Id: I2067b58c279c98915beb0a85462a6f3ea5744f36\n",
  "tree_diff": []
}