{"action":"created","comment":{"url":"https://api.github.com/repos/airlab-course/lab1/pulls/comments/347117544","pull_request_review_id":318000365,"id":347117544,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDM0NzExNzU0NA==","diff_hunk":"@@ -44,4 +44,8 @@ class Button\n     int state;\n     int debounceState;\n     unsigned long debounceLastMs;\n-};\n\\ No newline at end of file\n+<<<<<<< HEAD\n+};\n+=======\n+};\n+>>>>>>> buzzer-and-buttons","path":"lab1/button.h","position":10,"original_position":10,"commit_id":"9da6906271dddec45d54270b09fe0b9ae84f6b47","original_commit_id":"9da6906271dddec45d54270b09fe0b9ae84f6b47","user":{"login":"anivanch","id":51457340,"node_id":"MDQ6VXNlcjUxNDU3MzQw","avatar_url":"https://avatars3.githubusercontent.com/u/51457340?v=4","gravatar_id":"","url":"https://api.github.com/users/anivanch","html_url":"https://github.com/anivanch","followers_url":"https://api.github.com/users/anivanch/followers","following_url":"https://api.github.com/users/anivanch/following{/other_user}","gists_url":"https://api.github.com/users/anivanch/gists{/gist_id}","starred_url":"https://api.github.com/users/anivanch/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anivanch/subscriptions","organizations_url":"https://api.github.com/users/anivanch/orgs","repos_url":"https://api.github.com/users/anivanch/repos","events_url":"https://api.github.com/users/anivanch/events{/privacy}","received_events_url":"https://api.github.com/users/anivanch/received_events","type":"User","site_admin":false},"body":"Неразрешенный конфликт","created_at":"2019-11-17T04:32:53Z","updated_at":"2019-11-17T04:32:54Z","html_url":"https://github.com/airlab-course/lab1/pull/29#discussion_r347117544","pull_request_url":"https://api.github.com/repos/airlab-course/lab1/pulls/29","author_association":"COLLABORATOR","_links":{"self":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/comments/347117544"},"html":{"href":"https://github.com/airlab-course/lab1/pull/29#discussion_r347117544"},"pull_request":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/29"}}},"pull_request":{"url":"https://api.github.com/repos/airlab-course/lab1/pulls/29","id":335795856,"node_id":"MDExOlB1bGxSZXF1ZXN0MzM1Nzk1ODU2","html_url":"https://github.com/airlab-course/lab1/pull/29","diff_url":"https://github.com/airlab-course/lab1/pull/29.diff","patch_url":"https://github.com/airlab-course/lab1/pull/29.patch","issue_url":"https://api.github.com/repos/airlab-course/lab1/issues/29","number":29,"state":"open","locked":false,"title":"Задание 11, Ремша Игорь","user":{"login":"IRemsha","id":40166328,"node_id":"MDQ6VXNlcjQwMTY2MzI4","avatar_url":"https://avatars3.githubusercontent.com/u/40166328?v=4","gravatar_id":"","url":"https://api.github.com/users/IRemsha","html_url":"https://github.com/IRemsha","followers_url":"https://api.github.com/users/IRemsha/followers","following_url":"https://api.github.com/users/IRemsha/following{/other_user}","gists_url":"https://api.github.com/users/IRemsha/gists{/gist_id}","starred_url":"https://api.github.com/users/IRemsha/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IRemsha/subscriptions","organizations_url":"https://api.github.com/users/IRemsha/orgs","repos_url":"https://api.github.com/users/IRemsha/repos","events_url":"https://api.github.com/users/IRemsha/events{/privacy}","received_events_url":"https://api.github.com/users/IRemsha/received_events","type":"User","site_admin":false},"body":"","created_at":"2019-11-02T09:47:27Z","updated_at":"2019-11-17T04:32:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"0f9c6cadb304f2e2544be0a69508c27da16e3108","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/airlab-course/lab1/pulls/29/commits","review_comments_url":"https://api.github.com/repos/airlab-course/lab1/pulls/29/comments","review_comment_url":"https://api.github.com/repos/airlab-course/lab1/pulls/comments{/number}","comments_url":"https://api.github.com/repos/airlab-course/lab1/issues/29/comments","statuses_url":"https://api.github.com/repos/airlab-course/lab1/statuses/9da6906271dddec45d54270b09fe0b9ae84f6b47","head":{"label":"IRemsha:master","ref":"master","sha":"9da6906271dddec45d54270b09fe0b9ae84f6b47","user":{"login":"IRemsha","id":40166328,"node_id":"MDQ6VXNlcjQwMTY2MzI4","avatar_url":"https://avatars3.githubusercontent.com/u/40166328?v=4","gravatar_id":"","url":"https://api.github.com/users/IRemsha","html_url":"https://github.com/IRemsha","followers_url":"https://api.github.com/users/IRemsha/followers","following_url":"https://api.github.com/users/IRemsha/following{/other_user}","gists_url":"https://api.github.com/users/IRemsha/gists{/gist_id}","starred_url":"https://api.github.com/users/IRemsha/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IRemsha/subscriptions","organizations_url":"https://api.github.com/users/IRemsha/orgs","repos_url":"https://api.github.com/users/IRemsha/repos","events_url":"https://api.github.com/users/IRemsha/events{/privacy}","received_events_url":"https://api.github.com/users/IRemsha/received_events","type":"User","site_admin":false},"repo":{"id":219127678,"node_id":"MDEwOlJlcG9zaXRvcnkyMTkxMjc2Nzg=","name":"lab1","full_name":"IRemsha/lab1","private":false,"owner":{"login":"IRemsha","id":40166328,"node_id":"MDQ6VXNlcjQwMTY2MzI4","avatar_url":"https://avatars3.githubusercontent.com/u/40166328?v=4","gravatar_id":"","url":"https://api.github.com/users/IRemsha","html_url":"https://github.com/IRemsha","followers_url":"https://api.github.com/users/IRemsha/followers","following_url":"https://api.github.com/users/IRemsha/following{/other_user}","gists_url":"https://api.github.com/users/IRemsha/gists{/gist_id}","starred_url":"https://api.github.com/users/IRemsha/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IRemsha/subscriptions","organizations_url":"https://api.github.com/users/IRemsha/orgs","repos_url":"https://api.github.com/users/IRemsha/repos","events_url":"https://api.github.com/users/IRemsha/events{/privacy}","received_events_url":"https://api.github.com/users/IRemsha/received_events","type":"User","site_admin":false},"html_url":"https://github.com/IRemsha/lab1","description":null,"fork":true,"url":"https://api.github.com/repos/IRemsha/lab1","forks_url":"https://api.github.com/repos/IRemsha/lab1/forks","keys_url":"https://api.github.com/repos/IRemsha/lab1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/IRemsha/lab1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/IRemsha/lab1/teams","hooks_url":"https://api.github.com/repos/IRemsha/lab1/hooks","issue_events_url":"https://api.github.com/repos/IRemsha/lab1/issues/events{/number}","events_url":"https://api.github.com/repos/IRemsha/lab1/events","assignees_url":"https://api.github.com/repos/IRemsha/lab1/assignees{/user}","branches_url":"https://api.github.com/repos/IRemsha/lab1/branches{/branch}","tags_url":"https://api.github.com/repos/IRemsha/lab1/tags","blobs_url":"https://api.github.com/repos/IRemsha/lab1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/IRemsha/lab1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/IRemsha/lab1/git/refs{/sha}","trees_url":"https://api.github.com/repos/IRemsha/lab1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/IRemsha/lab1/statuses/{sha}","languages_url":"https://api.github.com/repos/IRemsha/lab1/languages","stargazers_url":"https://api.github.com/repos/IRemsha/lab1/stargazers","contributors_url":"https://api.github.com/repos/IRemsha/lab1/contributors","subscribers_url":"https://api.github.com/repos/IRemsha/lab1/subscribers","subscription_url":"https://api.github.com/repos/IRemsha/lab1/subscription","commits_url":"https://api.github.com/repos/IRemsha/lab1/commits{/sha}","git_commits_url":"https://api.github.com/repos/IRemsha/lab1/git/commits{/sha}","comments_url":"https://api.github.com/repos/IRemsha/lab1/comments{/number}","issue_comment_url":"https://api.github.com/repos/IRemsha/lab1/issues/comments{/number}","contents_url":"https://api.github.com/repos/IRemsha/lab1/contents/{+path}","compare_url":"https://api.github.com/repos/IRemsha/lab1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/IRemsha/lab1/merges","archive_url":"https://api.github.com/repos/IRemsha/lab1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/IRemsha/lab1/downloads","issues_url":"https://api.github.com/repos/IRemsha/lab1/issues{/number}","pulls_url":"https://api.github.com/repos/IRemsha/lab1/pulls{/number}","milestones_url":"https://api.github.com/repos/IRemsha/lab1/milestones{/number}","notifications_url":"https://api.github.com/repos/IRemsha/lab1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/IRemsha/lab1/labels{/name}","releases_url":"https://api.github.com/repos/IRemsha/lab1/releases{/id}","deployments_url":"https://api.github.com/repos/IRemsha/lab1/deployments","created_at":"2019-11-02T08:49:52Z","updated_at":"2019-11-16T11:51:47Z","pushed_at":"2019-11-16T11:51:45Z","git_url":"git://github.com/IRemsha/lab1.git","ssh_url":"git@github.com:IRemsha/lab1.git","clone_url":"https://github.com/IRemsha/lab1.git","svn_url":"https://github.com/IRemsha/lab1","homepage":null,"size":10,"stargazers_count":1,"watchers_count":1,"language":"C++","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":0,"license":{"key":"unlicense","name":"The Unlicense","spdx_id":"Unlicense","url":"https://api.github.com/licenses/unlicense","node_id":"MDc6TGljZW5zZTE1"},"forks":0,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"airlab-course:buzzer-and-buttons","ref":"buzzer-and-buttons","sha":"94fc8a8712963d123f0bfe8b190e8fc8745a8d17","user":{"login":"airlab-course","id":55801751,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU1ODAxNzUx","avatar_url":"https://avatars1.githubusercontent.com/u/55801751?v=4","gravatar_id":"","url":"https://api.github.com/users/airlab-course","html_url":"https://github.com/airlab-course","followers_url":"https://api.github.com/users/airlab-course/followers","following_url":"https://api.github.com/users/airlab-course/following{/other_user}","gists_url":"https://api.github.com/users/airlab-course/gists{/gist_id}","starred_url":"https://api.github.com/users/airlab-course/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/airlab-course/subscriptions","organizations_url":"https://api.github.com/users/airlab-course/orgs","repos_url":"https://api.github.com/users/airlab-course/repos","events_url":"https://api.github.com/users/airlab-course/events{/privacy}","received_events_url":"https://api.github.com/users/airlab-course/received_events","type":"Organization","site_admin":false},"repo":{"id":210879982,"node_id":"MDEwOlJlcG9zaXRvcnkyMTA4Nzk5ODI=","name":"lab1","full_name":"airlab-course/lab1","private":false,"owner":{"login":"airlab-course","id":55801751,"node_id":"MDEyOk9yZ2FuaXphdGlvbjU1ODAxNzUx","avatar_url":"https://avatars1.githubusercontent.com/u/55801751?v=4","gravatar_id":"","url":"https://api.github.com/users/airlab-course","html_url":"https://github.com/airlab-course","followers_url":"https://api.github.com/users/airlab-course/followers","following_url":"https://api.github.com/users/airlab-course/following{/other_user}","gists_url":"https://api.github.com/users/airlab-course/gists{/gist_id}","starred_url":"https://api.github.com/users/airlab-course/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/airlab-course/subscriptions","organizations_url":"https://api.github.com/users/airlab-course/orgs","repos_url":"https://api.github.com/users/airlab-course/repos","events_url":"https://api.github.com/users/airlab-course/events{/privacy}","received_events_url":"https://api.github.com/users/airlab-course/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/airlab-course/lab1","description":null,"fork":false,"url":"https://api.github.com/repos/airlab-course/lab1","forks_url":"https://api.github.com/repos/airlab-course/lab1/forks","keys_url":"https://api.github.com/repos/airlab-course/lab1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/airlab-course/lab1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/airlab-course/lab1/teams","hooks_url":"https://api.github.com/repos/airlab-course/lab1/hooks","issue_events_url":"https://api.github.com/repos/airlab-course/lab1/issues/events{/number}","events_url":"https://api.github.com/repos/airlab-course/lab1/events","assignees_url":"https://api.github.com/repos/airlab-course/lab1/assignees{/user}","branches_url":"https://api.github.com/repos/airlab-course/lab1/branches{/branch}","tags_url":"https://api.github.com/repos/airlab-course/lab1/tags","blobs_url":"https://api.github.com/repos/airlab-course/lab1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/airlab-course/lab1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/airlab-course/lab1/git/refs{/sha}","trees_url":"https://api.github.com/repos/airlab-course/lab1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/airlab-course/lab1/statuses/{sha}","languages_url":"https://api.github.com/repos/airlab-course/lab1/languages","stargazers_url":"https://api.github.com/repos/airlab-course/lab1/stargazers","contributors_url":"https://api.github.com/repos/airlab-course/lab1/contributors","subscribers_url":"https://api.github.com/repos/airlab-course/lab1/subscribers","subscription_url":"https://api.github.com/repos/airlab-course/lab1/subscription","commits_url":"https://api.github.com/repos/airlab-course/lab1/commits{/sha}","git_commits_url":"https://api.github.com/repos/airlab-course/lab1/git/commits{/sha}","comments_url":"https://api.github.com/repos/airlab-course/lab1/comments{/number}","issue_comment_url":"https://api.github.com/repos/airlab-course/lab1/issues/comments{/number}","contents_url":"https://api.github.com/repos/airlab-course/lab1/contents/{+path}","compare_url":"https://api.github.com/repos/airlab-course/lab1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/airlab-course/lab1/merges","archive_url":"https://api.github.com/repos/airlab-course/lab1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/airlab-course/lab1/downloads","issues_url":"https://api.github.com/repos/airlab-course/lab1/issues{/number}","pulls_url":"https://api.github.com/repos/airlab-course/lab1/pulls{/number}","milestones_url":"https://api.github.com/repos/airlab-course/lab1/milestones{/number}","notifications_url":"https://api.github.com/repos/airlab-course/lab1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/airlab-course/lab1/labels{/name}","releases_url":"https://api.github.com/repos/airlab-course/lab1/releases{/id}","deployments_url":"https://api.github.com/repos/airlab-course/lab1/deployments","created_at":"2019-09-25T15:32:41Z","updated_at":"2019-10-18T16:21:07Z","pushed_at":"2019-11-16T13:14:07Z","git_url":"git://github.com/airlab-course/lab1.git","ssh_url":"git@github.com:airlab-course/lab1.git","clone_url":"https://github.com/airlab-course/lab1.git","svn_url":"https://github.com/airlab-course/lab1","homepage":null,"size":5,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":51,"mirror_url":null,"archived":false,"disabled":false,"open_issues_count":23,"license":{"key":"unlicense","name":"The Unlicense","spdx_id":"Unlicense","url":"https://api.github.com/licenses/unlicense","node_id":"MDc6TGljZW5zZTE1"},"forks":51,"open_issues":23,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/29"},"html":{"href":"https://github.com/airlab-course/lab1/pull/29"},"issue":{"href":"https://api.github.com/repos/airlab-course/lab1/issues/29"},"comments":{"href":"https://api.github.com/repos/airlab-course/lab1/issues/29/comments"},"review_comments":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/29/comments"},"review_comment":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/airlab-course/lab1/pulls/29/commits"},"statuses":{"href":"https://api.github.com/repos/airlab-course/lab1/statuses/9da6906271dddec45d54270b09fe0b9ae84f6b47"}},"author_association":"NONE"}}
{"actor":{"display_login":"anivanch"}}