{"action":"created","comment":{"url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/comments/59139004","id":59139004,"diff_hunk":"@@ -5,6 +5,13 @@ function startGame() {\n }\n \n function continueGame() {\n+<<<<<<< HEAD","path":"middleman/core.js","position":4,"original_position":4,"commit_id":"27fd86267bed4a68c371e0d664e4e04da4ec1df0","original_commit_id":"27fd86267bed4a68c371e0d664e4e04da4ec1df0","user":{"login":"aishek","id":151224,"avatar_url":"https://avatars.githubusercontent.com/u/151224?v=3","gravatar_id":"","url":"https://api.github.com/users/aishek","html_url":"https://github.com/aishek","followers_url":"https://api.github.com/users/aishek/followers","following_url":"https://api.github.com/users/aishek/following{/other_user}","gists_url":"https://api.github.com/users/aishek/gists{/gist_id}","starred_url":"https://api.github.com/users/aishek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aishek/subscriptions","organizations_url":"https://api.github.com/users/aishek/orgs","repos_url":"https://api.github.com/users/aishek/repos","events_url":"https://api.github.com/users/aishek/events{/privacy}","received_events_url":"https://api.github.com/users/aishek/received_events","type":"User","site_admin":false},"body":"вот такая отметка говорит о том, что ты маркер конфликта запихал в реквест – поправишь?","created_at":"2016-04-10T18:51:42Z","updated_at":"2016-04-10T18:51:42Z","html_url":"https://github.com/adavaika/adavaika.github.io/pull/1#discussion_r59139004","pull_request_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1","_links":{"self":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/comments/59139004"},"html":{"href":"https://github.com/adavaika/adavaika.github.io/pull/1#discussion_r59139004"},"pull_request":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1"}}},"pull_request":{"url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1","id":65605772,"html_url":"https://github.com/adavaika/adavaika.github.io/pull/1","diff_url":"https://github.com/adavaika/adavaika.github.io/pull/1.diff","patch_url":"https://github.com/adavaika/adavaika.github.io/pull/1.patch","issue_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/1","number":1,"state":"closed","locked":false,"title":"Middleman game","user":{"login":"adavaika","id":13627362,"avatar_url":"https://avatars.githubusercontent.com/u/13627362?v=3","gravatar_id":"","url":"https://api.github.com/users/adavaika","html_url":"https://github.com/adavaika","followers_url":"https://api.github.com/users/adavaika/followers","following_url":"https://api.github.com/users/adavaika/following{/other_user}","gists_url":"https://api.github.com/users/adavaika/gists{/gist_id}","starred_url":"https://api.github.com/users/adavaika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adavaika/subscriptions","organizations_url":"https://api.github.com/users/adavaika/orgs","repos_url":"https://api.github.com/users/adavaika/repos","events_url":"https://api.github.com/users/adavaika/events{/privacy}","received_events_url":"https://api.github.com/users/adavaika/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-04-07T10:17:37Z","updated_at":"2016-04-10T18:51:42Z","closed_at":"2016-04-07T13:52:08Z","merged_at":"2016-04-07T13:52:08Z","merge_commit_sha":"945e6c80bdbcf391737365889336f74cb13d5116","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1/commits","review_comments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1/comments","review_comment_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/comments{/number}","comments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/1/comments","statuses_url":"https://api.github.com/repos/adavaika/adavaika.github.io/statuses/27fd86267bed4a68c371e0d664e4e04da4ec1df0","head":{"label":"adavaika:middlemanGame","ref":"middlemanGame","sha":"27fd86267bed4a68c371e0d664e4e04da4ec1df0","user":{"login":"adavaika","id":13627362,"avatar_url":"https://avatars.githubusercontent.com/u/13627362?v=3","gravatar_id":"","url":"https://api.github.com/users/adavaika","html_url":"https://github.com/adavaika","followers_url":"https://api.github.com/users/adavaika/followers","following_url":"https://api.github.com/users/adavaika/following{/other_user}","gists_url":"https://api.github.com/users/adavaika/gists{/gist_id}","starred_url":"https://api.github.com/users/adavaika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adavaika/subscriptions","organizations_url":"https://api.github.com/users/adavaika/orgs","repos_url":"https://api.github.com/users/adavaika/repos","events_url":"https://api.github.com/users/adavaika/events{/privacy}","received_events_url":"https://api.github.com/users/adavaika/received_events","type":"User","site_admin":false},"repo":{"id":52664584,"name":"adavaika.github.io","full_name":"adavaika/adavaika.github.io","owner":{"login":"adavaika","id":13627362,"avatar_url":"https://avatars.githubusercontent.com/u/13627362?v=3","gravatar_id":"","url":"https://api.github.com/users/adavaika","html_url":"https://github.com/adavaika","followers_url":"https://api.github.com/users/adavaika/followers","following_url":"https://api.github.com/users/adavaika/following{/other_user}","gists_url":"https://api.github.com/users/adavaika/gists{/gist_id}","starred_url":"https://api.github.com/users/adavaika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adavaika/subscriptions","organizations_url":"https://api.github.com/users/adavaika/orgs","repos_url":"https://api.github.com/users/adavaika/repos","events_url":"https://api.github.com/users/adavaika/events{/privacy}","received_events_url":"https://api.github.com/users/adavaika/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/adavaika/adavaika.github.io","description":"","fork":false,"url":"https://api.github.com/repos/adavaika/adavaika.github.io","forks_url":"https://api.github.com/repos/adavaika/adavaika.github.io/forks","keys_url":"https://api.github.com/repos/adavaika/adavaika.github.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/adavaika/adavaika.github.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/adavaika/adavaika.github.io/teams","hooks_url":"https://api.github.com/repos/adavaika/adavaika.github.io/hooks","issue_events_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/events{/number}","events_url":"https://api.github.com/repos/adavaika/adavaika.github.io/events","assignees_url":"https://api.github.com/repos/adavaika/adavaika.github.io/assignees{/user}","branches_url":"https://api.github.com/repos/adavaika/adavaika.github.io/branches{/branch}","tags_url":"https://api.github.com/repos/adavaika/adavaika.github.io/tags","blobs_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/adavaika/adavaika.github.io/statuses/{sha}","languages_url":"https://api.github.com/repos/adavaika/adavaika.github.io/languages","stargazers_url":"https://api.github.com/repos/adavaika/adavaika.github.io/stargazers","contributors_url":"https://api.github.com/repos/adavaika/adavaika.github.io/contributors","subscribers_url":"https://api.github.com/repos/adavaika/adavaika.github.io/subscribers","subscription_url":"https://api.github.com/repos/adavaika/adavaika.github.io/subscription","commits_url":"https://api.github.com/repos/adavaika/adavaika.github.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/adavaika/adavaika.github.io/contents/{+path}","compare_url":"https://api.github.com/repos/adavaika/adavaika.github.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/adavaika/adavaika.github.io/merges","archive_url":"https://api.github.com/repos/adavaika/adavaika.github.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/adavaika/adavaika.github.io/downloads","issues_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues{/number}","pulls_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls{/number}","milestones_url":"https://api.github.com/repos/adavaika/adavaika.github.io/milestones{/number}","notifications_url":"https://api.github.com/repos/adavaika/adavaika.github.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/adavaika/adavaika.github.io/labels{/name}","releases_url":"https://api.github.com/repos/adavaika/adavaika.github.io/releases{/id}","deployments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/deployments","created_at":"2016-02-27T11:57:07Z","updated_at":"2016-03-28T18:35:16Z","pushed_at":"2016-04-07T14:04:09Z","git_url":"git://github.com/adavaika/adavaika.github.io.git","ssh_url":"git@github.com:adavaika/adavaika.github.io.git","clone_url":"https://github.com/adavaika/adavaika.github.io.git","svn_url":"https://github.com/adavaika/adavaika.github.io","homepage":null,"size":101,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"adavaika:master","ref":"master","sha":"61d459e371e498701d921b482959dd2e8266dddb","user":{"login":"adavaika","id":13627362,"avatar_url":"https://avatars.githubusercontent.com/u/13627362?v=3","gravatar_id":"","url":"https://api.github.com/users/adavaika","html_url":"https://github.com/adavaika","followers_url":"https://api.github.com/users/adavaika/followers","following_url":"https://api.github.com/users/adavaika/following{/other_user}","gists_url":"https://api.github.com/users/adavaika/gists{/gist_id}","starred_url":"https://api.github.com/users/adavaika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adavaika/subscriptions","organizations_url":"https://api.github.com/users/adavaika/orgs","repos_url":"https://api.github.com/users/adavaika/repos","events_url":"https://api.github.com/users/adavaika/events{/privacy}","received_events_url":"https://api.github.com/users/adavaika/received_events","type":"User","site_admin":false},"repo":{"id":52664584,"name":"adavaika.github.io","full_name":"adavaika/adavaika.github.io","owner":{"login":"adavaika","id":13627362,"avatar_url":"https://avatars.githubusercontent.com/u/13627362?v=3","gravatar_id":"","url":"https://api.github.com/users/adavaika","html_url":"https://github.com/adavaika","followers_url":"https://api.github.com/users/adavaika/followers","following_url":"https://api.github.com/users/adavaika/following{/other_user}","gists_url":"https://api.github.com/users/adavaika/gists{/gist_id}","starred_url":"https://api.github.com/users/adavaika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adavaika/subscriptions","organizations_url":"https://api.github.com/users/adavaika/orgs","repos_url":"https://api.github.com/users/adavaika/repos","events_url":"https://api.github.com/users/adavaika/events{/privacy}","received_events_url":"https://api.github.com/users/adavaika/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/adavaika/adavaika.github.io","description":"","fork":false,"url":"https://api.github.com/repos/adavaika/adavaika.github.io","forks_url":"https://api.github.com/repos/adavaika/adavaika.github.io/forks","keys_url":"https://api.github.com/repos/adavaika/adavaika.github.io/keys{/key_id}","collaborators_url":"https://api.github.com/repos/adavaika/adavaika.github.io/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/adavaika/adavaika.github.io/teams","hooks_url":"https://api.github.com/repos/adavaika/adavaika.github.io/hooks","issue_events_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/events{/number}","events_url":"https://api.github.com/repos/adavaika/adavaika.github.io/events","assignees_url":"https://api.github.com/repos/adavaika/adavaika.github.io/assignees{/user}","branches_url":"https://api.github.com/repos/adavaika/adavaika.github.io/branches{/branch}","tags_url":"https://api.github.com/repos/adavaika/adavaika.github.io/tags","blobs_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/refs{/sha}","trees_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/trees{/sha}","statuses_url":"https://api.github.com/repos/adavaika/adavaika.github.io/statuses/{sha}","languages_url":"https://api.github.com/repos/adavaika/adavaika.github.io/languages","stargazers_url":"https://api.github.com/repos/adavaika/adavaika.github.io/stargazers","contributors_url":"https://api.github.com/repos/adavaika/adavaika.github.io/contributors","subscribers_url":"https://api.github.com/repos/adavaika/adavaika.github.io/subscribers","subscription_url":"https://api.github.com/repos/adavaika/adavaika.github.io/subscription","commits_url":"https://api.github.com/repos/adavaika/adavaika.github.io/commits{/sha}","git_commits_url":"https://api.github.com/repos/adavaika/adavaika.github.io/git/commits{/sha}","comments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/comments{/number}","issue_comment_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/comments{/number}","contents_url":"https://api.github.com/repos/adavaika/adavaika.github.io/contents/{+path}","compare_url":"https://api.github.com/repos/adavaika/adavaika.github.io/compare/{base}...{head}","merges_url":"https://api.github.com/repos/adavaika/adavaika.github.io/merges","archive_url":"https://api.github.com/repos/adavaika/adavaika.github.io/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/adavaika/adavaika.github.io/downloads","issues_url":"https://api.github.com/repos/adavaika/adavaika.github.io/issues{/number}","pulls_url":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls{/number}","milestones_url":"https://api.github.com/repos/adavaika/adavaika.github.io/milestones{/number}","notifications_url":"https://api.github.com/repos/adavaika/adavaika.github.io/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/adavaika/adavaika.github.io/labels{/name}","releases_url":"https://api.github.com/repos/adavaika/adavaika.github.io/releases{/id}","deployments_url":"https://api.github.com/repos/adavaika/adavaika.github.io/deployments","created_at":"2016-02-27T11:57:07Z","updated_at":"2016-03-28T18:35:16Z","pushed_at":"2016-04-07T14:04:09Z","git_url":"git://github.com/adavaika/adavaika.github.io.git","ssh_url":"git@github.com:adavaika/adavaika.github.io.git","clone_url":"https://github.com/adavaika/adavaika.github.io.git","svn_url":"https://github.com/adavaika/adavaika.github.io","homepage":null,"size":101,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1"},"html":{"href":"https://github.com/adavaika/adavaika.github.io/pull/1"},"issue":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/1"},"comments":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/adavaika/adavaika.github.io/statuses/27fd86267bed4a68c371e0d664e4e04da4ec1df0"}}}}