{"action":"created","issue":{"url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/72","repository_url":"https://api.github.com/repos/jmy-kellogg/ChatterBot","labels_url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/72/labels{/name}","comments_url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/72/comments","events_url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/72/events","html_url":"https://github.com/jmy-kellogg/ChatterBot/pull/72","id":183242115,"number":72,"title":"resolving conflicts","user":{"login":"dejongnj","id":11298783,"avatar_url":"https://avatars.githubusercontent.com/u/11298783?v=3","gravatar_id":"","url":"https://api.github.com/users/dejongnj","html_url":"https://github.com/dejongnj","followers_url":"https://api.github.com/users/dejongnj/followers","following_url":"https://api.github.com/users/dejongnj/following{/other_user}","gists_url":"https://api.github.com/users/dejongnj/gists{/gist_id}","starred_url":"https://api.github.com/users/dejongnj/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dejongnj/subscriptions","organizations_url":"https://api.github.com/users/dejongnj/orgs","repos_url":"https://api.github.com/users/dejongnj/repos","events_url":"https://api.github.com/users/dejongnj/events{/privacy}","received_events_url":"https://api.github.com/users/dejongnj/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":1,"created_at":"2016-10-16T00:55:57Z","updated_at":"2016-10-16T01:05:43Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/pulls/72","html_url":"https://github.com/jmy-kellogg/ChatterBot/pull/72","diff_url":"https://github.com/jmy-kellogg/ChatterBot/pull/72.diff","patch_url":"https://github.com/jmy-kellogg/ChatterBot/pull/72.patch"},"body":"I tried to resolve conflicts but it doesn't seem to have taken. Here is another attempt. I was probably not the best person to try and resolve the conflicts since they were in files I wasn't working on."},"comment":{"url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/comments/254020745","html_url":"https://github.com/jmy-kellogg/ChatterBot/pull/72#issuecomment-254020745","issue_url":"https://api.github.com/repos/jmy-kellogg/ChatterBot/issues/72","id":254020745,"user":{"login":"jmy-kellogg","id":19378457,"avatar_url":"https://avatars.githubusercontent.com/u/19378457?v=3","gravatar_id":"","url":"https://api.github.com/users/jmy-kellogg","html_url":"https://github.com/jmy-kellogg","followers_url":"https://api.github.com/users/jmy-kellogg/followers","following_url":"https://api.github.com/users/jmy-kellogg/following{/other_user}","gists_url":"https://api.github.com/users/jmy-kellogg/gists{/gist_id}","starred_url":"https://api.github.com/users/jmy-kellogg/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmy-kellogg/subscriptions","organizations_url":"https://api.github.com/users/jmy-kellogg/orgs","repos_url":"https://api.github.com/users/jmy-kellogg/repos","events_url":"https://api.github.com/users/jmy-kellogg/events{/privacy}","received_events_url":"https://api.github.com/users/jmy-kellogg/received_events","type":"User","site_admin":false},"created_at":"2016-10-16T01:05:43Z","updated_at":"2016-10-16T01:05:43Z","body":"I think it should be fine. As long as the classNames don't change it should be alright for what I'm working on. As long as you didn't have issues on this commit I'm okay merging it"}}
{"actor":{"display_login":"jmy-kellogg"}}