{"action":"closed","number":2,"pull_request":{"url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2","id":207946376,"node_id":"MDExOlB1bGxSZXF1ZXN0MjA3OTQ2Mzc2","html_url":"https://github.com/archinnova-training/conflict-practice-austinds17/pull/2","diff_url":"https://github.com/archinnova-training/conflict-practice-austinds17/pull/2.diff","patch_url":"https://github.com/archinnova-training/conflict-practice-austinds17/pull/2.patch","issue_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/2","number":2,"state":"closed","locked":false,"title":"Minor CSS fixes","user":{"login":"deepakarchinnova","id":26195566,"node_id":"MDQ6VXNlcjI2MTk1NTY2","avatar_url":"https://avatars3.githubusercontent.com/u/26195566?v=4","gravatar_id":"","url":"https://api.github.com/users/deepakarchinnova","html_url":"https://github.com/deepakarchinnova","followers_url":"https://api.github.com/users/deepakarchinnova/followers","following_url":"https://api.github.com/users/deepakarchinnova/following{/other_user}","gists_url":"https://api.github.com/users/deepakarchinnova/gists{/gist_id}","starred_url":"https://api.github.com/users/deepakarchinnova/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deepakarchinnova/subscriptions","organizations_url":"https://api.github.com/users/deepakarchinnova/orgs","repos_url":"https://api.github.com/users/deepakarchinnova/repos","events_url":"https://api.github.com/users/deepakarchinnova/events{/privacy}","received_events_url":"https://api.github.com/users/deepakarchinnova/received_events","type":"User","site_admin":false},"body":"This pull request makes some small changes to the CSS. Pick the CSS that you think makes the most sense given the history of the file on both branches and resolve the merge conflict.\n\nIf you need any help resolving this conflict, check out this video: https://vimeo.com/225086721/5a00221234","created_at":"2018-08-13T11:24:08Z","updated_at":"2018-08-13T11:51:10Z","closed_at":"2018-08-13T11:51:10Z","merged_at":"2018-08-13T11:51:10Z","merge_commit_sha":"5e91c21211d17f6874437fcc53f9b7c78cf276dc","assignee":{"login":"austinds17","id":7566601,"node_id":"MDQ6VXNlcjc1NjY2MDE=","avatar_url":"https://avatars3.githubusercontent.com/u/7566601?v=4","gravatar_id":"","url":"https://api.github.com/users/austinds17","html_url":"https://github.com/austinds17","followers_url":"https://api.github.com/users/austinds17/followers","following_url":"https://api.github.com/users/austinds17/following{/other_user}","gists_url":"https://api.github.com/users/austinds17/gists{/gist_id}","starred_url":"https://api.github.com/users/austinds17/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/austinds17/subscriptions","organizations_url":"https://api.github.com/users/austinds17/orgs","repos_url":"https://api.github.com/users/austinds17/repos","events_url":"https://api.github.com/users/austinds17/events{/privacy}","received_events_url":"https://api.github.com/users/austinds17/received_events","type":"User","site_admin":false},"assignees":[{"login":"austinds17","id":7566601,"node_id":"MDQ6VXNlcjc1NjY2MDE=","avatar_url":"https://avatars3.githubusercontent.com/u/7566601?v=4","gravatar_id":"","url":"https://api.github.com/users/austinds17","html_url":"https://github.com/austinds17","followers_url":"https://api.github.com/users/austinds17/followers","following_url":"https://api.github.com/users/austinds17/following{/other_user}","gists_url":"https://api.github.com/users/austinds17/gists{/gist_id}","starred_url":"https://api.github.com/users/austinds17/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/austinds17/subscriptions","organizations_url":"https://api.github.com/users/austinds17/orgs","repos_url":"https://api.github.com/users/austinds17/repos","events_url":"https://api.github.com/users/austinds17/events{/privacy}","received_events_url":"https://api.github.com/users/austinds17/received_events","type":"User","site_admin":false}],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2/commits","review_comments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2/comments","review_comment_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/comments{/number}","comments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/2/comments","statuses_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/statuses/c472188f65823bc81e3229dce5c1f3194b18a014","head":{"label":"archinnova-training:css-changes","ref":"css-changes","sha":"c472188f65823bc81e3229dce5c1f3194b18a014","user":{"login":"archinnova-training","id":35951814,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM1OTUxODE0","avatar_url":"https://avatars3.githubusercontent.com/u/35951814?v=4","gravatar_id":"","url":"https://api.github.com/users/archinnova-training","html_url":"https://github.com/archinnova-training","followers_url":"https://api.github.com/users/archinnova-training/followers","following_url":"https://api.github.com/users/archinnova-training/following{/other_user}","gists_url":"https://api.github.com/users/archinnova-training/gists{/gist_id}","starred_url":"https://api.github.com/users/archinnova-training/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archinnova-training/subscriptions","organizations_url":"https://api.github.com/users/archinnova-training/orgs","repos_url":"https://api.github.com/users/archinnova-training/repos","events_url":"https://api.github.com/users/archinnova-training/events{/privacy}","received_events_url":"https://api.github.com/users/archinnova-training/received_events","type":"Organization","site_admin":false},"repo":{"id":144570096,"node_id":"MDEwOlJlcG9zaXRvcnkxNDQ1NzAwOTY=","name":"conflict-practice-austinds17","full_name":"archinnova-training/conflict-practice-austinds17","owner":{"login":"archinnova-training","id":35951814,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM1OTUxODE0","avatar_url":"https://avatars3.githubusercontent.com/u/35951814?v=4","gravatar_id":"","url":"https://api.github.com/users/archinnova-training","html_url":"https://github.com/archinnova-training","followers_url":"https://api.github.com/users/archinnova-training/followers","following_url":"https://api.github.com/users/archinnova-training/following{/other_user}","gists_url":"https://api.github.com/users/archinnova-training/gists{/gist_id}","starred_url":"https://api.github.com/users/archinnova-training/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archinnova-training/subscriptions","organizations_url":"https://api.github.com/users/archinnova-training/orgs","repos_url":"https://api.github.com/users/archinnova-training/repos","events_url":"https://api.github.com/users/archinnova-training/events{/privacy}","received_events_url":"https://api.github.com/users/archinnova-training/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/archinnova-training/conflict-practice-austinds17","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17","forks_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/forks","keys_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/teams","hooks_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/hooks","issue_events_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/events{/number}","events_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/events","assignees_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/assignees{/user}","branches_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/branches{/branch}","tags_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/tags","blobs_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/refs{/sha}","trees_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/statuses/{sha}","languages_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/languages","stargazers_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/stargazers","contributors_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/contributors","subscribers_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/subscribers","subscription_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/subscription","commits_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/commits{/sha}","git_commits_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/commits{/sha}","comments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/comments{/number}","issue_comment_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/comments{/number}","contents_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/contents/{+path}","compare_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/merges","archive_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/downloads","issues_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues{/number}","pulls_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls{/number}","milestones_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/milestones{/number}","notifications_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/labels{/name}","releases_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/releases{/id}","deployments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/deployments","created_at":"2018-08-13T11:23:45Z","updated_at":"2018-08-13T11:37:23Z","pushed_at":"2018-08-13T11:51:10Z","git_url":"git://github.com/archinnova-training/conflict-practice-austinds17.git","ssh_url":"git@github.com:archinnova-training/conflict-practice-austinds17.git","clone_url":"https://github.com/archinnova-training/conflict-practice-austinds17.git","svn_url":"https://github.com/archinnova-training/conflict-practice-austinds17","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"base":{"label":"archinnova-training:master","ref":"master","sha":"6235b329c2f224d367e2df577bf1b634224ed3f1","user":{"login":"archinnova-training","id":35951814,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM1OTUxODE0","avatar_url":"https://avatars3.githubusercontent.com/u/35951814?v=4","gravatar_id":"","url":"https://api.github.com/users/archinnova-training","html_url":"https://github.com/archinnova-training","followers_url":"https://api.github.com/users/archinnova-training/followers","following_url":"https://api.github.com/users/archinnova-training/following{/other_user}","gists_url":"https://api.github.com/users/archinnova-training/gists{/gist_id}","starred_url":"https://api.github.com/users/archinnova-training/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archinnova-training/subscriptions","organizations_url":"https://api.github.com/users/archinnova-training/orgs","repos_url":"https://api.github.com/users/archinnova-training/repos","events_url":"https://api.github.com/users/archinnova-training/events{/privacy}","received_events_url":"https://api.github.com/users/archinnova-training/received_events","type":"Organization","site_admin":false},"repo":{"id":144570096,"node_id":"MDEwOlJlcG9zaXRvcnkxNDQ1NzAwOTY=","name":"conflict-practice-austinds17","full_name":"archinnova-training/conflict-practice-austinds17","owner":{"login":"archinnova-training","id":35951814,"node_id":"MDEyOk9yZ2FuaXphdGlvbjM1OTUxODE0","avatar_url":"https://avatars3.githubusercontent.com/u/35951814?v=4","gravatar_id":"","url":"https://api.github.com/users/archinnova-training","html_url":"https://github.com/archinnova-training","followers_url":"https://api.github.com/users/archinnova-training/followers","following_url":"https://api.github.com/users/archinnova-training/following{/other_user}","gists_url":"https://api.github.com/users/archinnova-training/gists{/gist_id}","starred_url":"https://api.github.com/users/archinnova-training/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/archinnova-training/subscriptions","organizations_url":"https://api.github.com/users/archinnova-training/orgs","repos_url":"https://api.github.com/users/archinnova-training/repos","events_url":"https://api.github.com/users/archinnova-training/events{/privacy}","received_events_url":"https://api.github.com/users/archinnova-training/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/archinnova-training/conflict-practice-austinds17","description":"Let's resolve some conflicts.","fork":false,"url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17","forks_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/forks","keys_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/keys{/key_id}","collaborators_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/teams","hooks_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/hooks","issue_events_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/events{/number}","events_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/events","assignees_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/assignees{/user}","branches_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/branches{/branch}","tags_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/tags","blobs_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/refs{/sha}","trees_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/trees{/sha}","statuses_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/statuses/{sha}","languages_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/languages","stargazers_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/stargazers","contributors_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/contributors","subscribers_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/subscribers","subscription_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/subscription","commits_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/commits{/sha}","git_commits_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/git/commits{/sha}","comments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/comments{/number}","issue_comment_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/comments{/number}","contents_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/contents/{+path}","compare_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/compare/{base}...{head}","merges_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/merges","archive_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/downloads","issues_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues{/number}","pulls_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls{/number}","milestones_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/milestones{/number}","notifications_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/labels{/name}","releases_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/releases{/id}","deployments_url":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/deployments","created_at":"2018-08-13T11:23:45Z","updated_at":"2018-08-13T11:37:23Z","pushed_at":"2018-08-13T11:51:10Z","git_url":"git://github.com/archinnova-training/conflict-practice-austinds17.git","ssh_url":"git@github.com:archinnova-training/conflict-practice-austinds17.git","clone_url":"https://github.com/archinnova-training/conflict-practice-austinds17.git","svn_url":"https://github.com/archinnova-training/conflict-practice-austinds17","homepage":null,"size":0,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":1,"license":null,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2"},"html":{"href":"https://github.com/archinnova-training/conflict-practice-austinds17/pull/2"},"issue":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/2"},"comments":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/archinnova-training/conflict-practice-austinds17/statuses/c472188f65823bc81e3229dce5c1f3194b18a014"}},"author_association":"NONE","merged":true,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":{"login":"austinds17","id":7566601,"node_id":"MDQ6VXNlcjc1NjY2MDE=","avatar_url":"https://avatars3.githubusercontent.com/u/7566601?v=4","gravatar_id":"","url":"https://api.github.com/users/austinds17","html_url":"https://github.com/austinds17","followers_url":"https://api.github.com/users/austinds17/followers","following_url":"https://api.github.com/users/austinds17/following{/other_user}","gists_url":"https://api.github.com/users/austinds17/gists{/gist_id}","starred_url":"https://api.github.com/users/austinds17/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/austinds17/subscriptions","organizations_url":"https://api.github.com/users/austinds17/orgs","repos_url":"https://api.github.com/users/austinds17/repos","events_url":"https://api.github.com/users/austinds17/events{/privacy}","received_events_url":"https://api.github.com/users/austinds17/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":4,"additions":0,"deletions":141,"changed_files":1}}
{"actor":{"display_login":"austinds17"}}