{"action":"created","issue":{"url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/13","repository_url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial","labels_url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/13/labels{/name}","comments_url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/13/comments","events_url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/13/events","html_url":"https://github.com/CSCE546ProSocial/ProSocial/pull/13","id":315314977,"number":13,"title":"Wills branch","user":{"login":"G-Enigma","id":18518060,"avatar_url":"https://avatars1.githubusercontent.com/u/18518060?v=4","gravatar_id":"","url":"https://api.github.com/users/G-Enigma","html_url":"https://github.com/G-Enigma","followers_url":"https://api.github.com/users/G-Enigma/followers","following_url":"https://api.github.com/users/G-Enigma/following{/other_user}","gists_url":"https://api.github.com/users/G-Enigma/gists{/gist_id}","starred_url":"https://api.github.com/users/G-Enigma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/G-Enigma/subscriptions","organizations_url":"https://api.github.com/users/G-Enigma/orgs","repos_url":"https://api.github.com/users/G-Enigma/repos","events_url":"https://api.github.com/users/G-Enigma/events{/privacy}","received_events_url":"https://api.github.com/users/G-Enigma/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-04-18T03:14:14Z","updated_at":"2018-04-19T13:25:30Z","closed_at":null,"author_association":"CONTRIBUTOR","pull_request":{"url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/pulls/13","html_url":"https://github.com/CSCE546ProSocial/ProSocial/pull/13","diff_url":"https://github.com/CSCE546ProSocial/ProSocial/pull/13.diff","patch_url":"https://github.com/CSCE546ProSocial/ProSocial/pull/13.patch"},"body":"My gitignore changes need to be added to the .gitignore for the whole repo after Ethan's branch is merged so that the android platform build files (which are extraneous for our purposes) don't get pushed along with them. My only significant changes were to the splash screen folders, splash.html, and splash.scss."},"comment":{"url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/comments/382734067","html_url":"https://github.com/CSCE546ProSocial/ProSocial/pull/13#issuecomment-382734067","issue_url":"https://api.github.com/repos/CSCE546ProSocial/ProSocial/issues/13","id":382734067,"user":{"login":"ethangamma24","id":16707967,"avatar_url":"https://avatars2.githubusercontent.com/u/16707967?v=4","gravatar_id":"","url":"https://api.github.com/users/ethangamma24","html_url":"https://github.com/ethangamma24","followers_url":"https://api.github.com/users/ethangamma24/followers","following_url":"https://api.github.com/users/ethangamma24/following{/other_user}","gists_url":"https://api.github.com/users/ethangamma24/gists{/gist_id}","starred_url":"https://api.github.com/users/ethangamma24/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ethangamma24/subscriptions","organizations_url":"https://api.github.com/users/ethangamma24/orgs","repos_url":"https://api.github.com/users/ethangamma24/repos","events_url":"https://api.github.com/users/ethangamma24/events{/privacy}","received_events_url":"https://api.github.com/users/ethangamma24/received_events","type":"User","site_admin":false},"created_at":"2018-04-19T13:25:30Z","updated_at":"2018-04-19T13:25:30Z","author_association":"CONTRIBUTOR","body":"Oh geez, these merges are such a nightmare. @G-Enigma do you think you could attempt to use mergetool to fix this? I'll do some research and see if there's anything we can do to decrease the number of merge conflicts."}}
{"actor":{"display_login":"ethangamma24"}}