{"comment":{"url":"https://api.github.com/repos/tue-robotics/ed_object_models/comments/11163659","html_url":"https://github.com/tue-robotics/ed_object_models/commit/a27b92e2b669a7f51f0da51923e2c153c6a7a851#commitcomment-11163659","id":11163659,"user":{"login":"LoyVanBeek","id":709259,"avatar_url":"https://avatars.githubusercontent.com/u/709259?v=3","gravatar_id":"","url":"https://api.github.com/users/LoyVanBeek","html_url":"https://github.com/LoyVanBeek","followers_url":"https://api.github.com/users/LoyVanBeek/followers","following_url":"https://api.github.com/users/LoyVanBeek/following{/other_user}","gists_url":"https://api.github.com/users/LoyVanBeek/gists{/gist_id}","starred_url":"https://api.github.com/users/LoyVanBeek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/LoyVanBeek/subscriptions","organizations_url":"https://api.github.com/users/LoyVanBeek/orgs","repos_url":"https://api.github.com/users/LoyVanBeek/repos","events_url":"https://api.github.com/users/LoyVanBeek/events{/privacy}","received_events_url":"https://api.github.com/users/LoyVanBeek/received_events","type":"User","site_admin":false},"position":40,"line":167,"path":"models/robotics_testlabs/model.yaml","commit_id":"a27b92e2b669a7f51f0da51923e2c153c6a7a851","created_at":"2015-05-12T20:51:17Z","updated_at":"2015-05-12T20:51:17Z","body":"@egeerts this is a conflict in our models. This works but needs to be properly merged"}}