{"action":"created","comment":{"url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments/85952016","pull_request_review_id":6625709,"id":85952016,"diff_hunk":"@@ -1,5 +1,9 @@\n <html>\n <body>\n+<<<<<<< HEAD\n+<h2>Hello World!!!</h2>\n+=======\n <h2>Hello World!</h2>\n+>>>>>>> bf28f85dd980f4aab1aec07ba8bea24d0531e8f6","path":"module18/src/main/webapp/index.jsp","position":7,"original_position":7,"commit_id":"7572b10b2c36bd9fe1fac822d6115d9d707af4d4","original_commit_id":"7572b10b2c36bd9fe1fac822d6115d9d707af4d4","user":{"login":"rxn1d","id":3824602,"avatar_url":"https://avatars.githubusercontent.com/u/3824602?v=3","gravatar_id":"","url":"https://api.github.com/users/rxn1d","html_url":"https://github.com/rxn1d","followers_url":"https://api.github.com/users/rxn1d/followers","following_url":"https://api.github.com/users/rxn1d/following{/other_user}","gists_url":"https://api.github.com/users/rxn1d/gists{/gist_id}","starred_url":"https://api.github.com/users/rxn1d/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rxn1d/subscriptions","organizations_url":"https://api.github.com/users/rxn1d/orgs","repos_url":"https://api.github.com/users/rxn1d/repos","events_url":"https://api.github.com/users/rxn1d/events{/privacy}","received_events_url":"https://api.github.com/users/rxn1d/received_events","type":"User","site_admin":false},"body":"нужно удалить","created_at":"2016-11-01T15:30:23Z","updated_at":"2016-11-01T15:30:54Z","html_url":"https://github.com/rxn1d/courses-2-2016/pull/55#discussion_r85952016","pull_request_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55","_links":{"self":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments/85952016"},"html":{"href":"https://github.com/rxn1d/courses-2-2016/pull/55#discussion_r85952016"},"pull_request":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55"}}},"pull_request":{"url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55","id":91516329,"html_url":"https://github.com/rxn1d/courses-2-2016/pull/55","diff_url":"https://github.com/rxn1d/courses-2-2016/pull/55.diff","patch_url":"https://github.com/rxn1d/courses-2-2016/pull/55.patch","issue_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/55","number":55,"state":"open","locked":false,"title":"Done HW lesson 16","user":{"login":"progmaker2","id":19866397,"avatar_url":"https://avatars.githubusercontent.com/u/19866397?v=3","gravatar_id":"","url":"https://api.github.com/users/progmaker2","html_url":"https://github.com/progmaker2","followers_url":"https://api.github.com/users/progmaker2/followers","following_url":"https://api.github.com/users/progmaker2/following{/other_user}","gists_url":"https://api.github.com/users/progmaker2/gists{/gist_id}","starred_url":"https://api.github.com/users/progmaker2/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progmaker2/subscriptions","organizations_url":"https://api.github.com/users/progmaker2/orgs","repos_url":"https://api.github.com/users/progmaker2/repos","events_url":"https://api.github.com/users/progmaker2/events{/privacy}","received_events_url":"https://api.github.com/users/progmaker2/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-10-30T09:40:07Z","updated_at":"2016-11-01T15:30:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"4ef4190b07f782f8a8eb3dcf42c3fcf144d88615","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55/commits","review_comments_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55/comments","review_comment_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments{/number}","comments_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/55/comments","statuses_url":"https://api.github.com/repos/rxn1d/courses-2-2016/statuses/7572b10b2c36bd9fe1fac822d6115d9d707af4d4","head":{"label":"progmaker2:master","ref":"master","sha":"7572b10b2c36bd9fe1fac822d6115d9d707af4d4","user":{"login":"progmaker2","id":19866397,"avatar_url":"https://avatars.githubusercontent.com/u/19866397?v=3","gravatar_id":"","url":"https://api.github.com/users/progmaker2","html_url":"https://github.com/progmaker2","followers_url":"https://api.github.com/users/progmaker2/followers","following_url":"https://api.github.com/users/progmaker2/following{/other_user}","gists_url":"https://api.github.com/users/progmaker2/gists{/gist_id}","starred_url":"https://api.github.com/users/progmaker2/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progmaker2/subscriptions","organizations_url":"https://api.github.com/users/progmaker2/orgs","repos_url":"https://api.github.com/users/progmaker2/repos","events_url":"https://api.github.com/users/progmaker2/events{/privacy}","received_events_url":"https://api.github.com/users/progmaker2/received_events","type":"User","site_admin":false},"repo":{"id":62828713,"name":"courses-2-2016","full_name":"progmaker2/courses-2-2016","owner":{"login":"progmaker2","id":19866397,"avatar_url":"https://avatars.githubusercontent.com/u/19866397?v=3","gravatar_id":"","url":"https://api.github.com/users/progmaker2","html_url":"https://github.com/progmaker2","followers_url":"https://api.github.com/users/progmaker2/followers","following_url":"https://api.github.com/users/progmaker2/following{/other_user}","gists_url":"https://api.github.com/users/progmaker2/gists{/gist_id}","starred_url":"https://api.github.com/users/progmaker2/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/progmaker2/subscriptions","organizations_url":"https://api.github.com/users/progmaker2/orgs","repos_url":"https://api.github.com/users/progmaker2/repos","events_url":"https://api.github.com/users/progmaker2/events{/privacy}","received_events_url":"https://api.github.com/users/progmaker2/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/progmaker2/courses-2-2016","description":"Java courses materials and resources for group 2-2106","fork":true,"url":"https://api.github.com/repos/progmaker2/courses-2-2016","forks_url":"https://api.github.com/repos/progmaker2/courses-2-2016/forks","keys_url":"https://api.github.com/repos/progmaker2/courses-2-2016/keys{/key_id}","collaborators_url":"https://api.github.com/repos/progmaker2/courses-2-2016/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/progmaker2/courses-2-2016/teams","hooks_url":"https://api.github.com/repos/progmaker2/courses-2-2016/hooks","issue_events_url":"https://api.github.com/repos/progmaker2/courses-2-2016/issues/events{/number}","events_url":"https://api.github.com/repos/progmaker2/courses-2-2016/events","assignees_url":"https://api.github.com/repos/progmaker2/courses-2-2016/assignees{/user}","branches_url":"https://api.github.com/repos/progmaker2/courses-2-2016/branches{/branch}","tags_url":"https://api.github.com/repos/progmaker2/courses-2-2016/tags","blobs_url":"https://api.github.com/repos/progmaker2/courses-2-2016/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/progmaker2/courses-2-2016/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/progmaker2/courses-2-2016/git/refs{/sha}","trees_url":"https://api.github.com/repos/progmaker2/courses-2-2016/git/trees{/sha}","statuses_url":"https://api.github.com/repos/progmaker2/courses-2-2016/statuses/{sha}","languages_url":"https://api.github.com/repos/progmaker2/courses-2-2016/languages","stargazers_url":"https://api.github.com/repos/progmaker2/courses-2-2016/stargazers","contributors_url":"https://api.github.com/repos/progmaker2/courses-2-2016/contributors","subscribers_url":"https://api.github.com/repos/progmaker2/courses-2-2016/subscribers","subscription_url":"https://api.github.com/repos/progmaker2/courses-2-2016/subscription","commits_url":"https://api.github.com/repos/progmaker2/courses-2-2016/commits{/sha}","git_commits_url":"https://api.github.com/repos/progmaker2/courses-2-2016/git/commits{/sha}","comments_url":"https://api.github.com/repos/progmaker2/courses-2-2016/comments{/number}","issue_comment_url":"https://api.github.com/repos/progmaker2/courses-2-2016/issues/comments{/number}","contents_url":"https://api.github.com/repos/progmaker2/courses-2-2016/contents/{+path}","compare_url":"https://api.github.com/repos/progmaker2/courses-2-2016/compare/{base}...{head}","merges_url":"https://api.github.com/repos/progmaker2/courses-2-2016/merges","archive_url":"https://api.github.com/repos/progmaker2/courses-2-2016/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/progmaker2/courses-2-2016/downloads","issues_url":"https://api.github.com/repos/progmaker2/courses-2-2016/issues{/number}","pulls_url":"https://api.github.com/repos/progmaker2/courses-2-2016/pulls{/number}","milestones_url":"https://api.github.com/repos/progmaker2/courses-2-2016/milestones{/number}","notifications_url":"https://api.github.com/repos/progmaker2/courses-2-2016/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/progmaker2/courses-2-2016/labels{/name}","releases_url":"https://api.github.com/repos/progmaker2/courses-2-2016/releases{/id}","deployments_url":"https://api.github.com/repos/progmaker2/courses-2-2016/deployments","created_at":"2016-07-07T18:15:50Z","updated_at":"2016-07-07T18:15:52Z","pushed_at":"2016-11-01T13:52:23Z","git_url":"git://github.com/progmaker2/courses-2-2016.git","ssh_url":"git@github.com:progmaker2/courses-2-2016.git","clone_url":"https://github.com/progmaker2/courses-2-2016.git","svn_url":"https://github.com/progmaker2/courses-2-2016","homepage":"","size":499,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"rxn1d:course/progmaker2","ref":"course/progmaker2","sha":"bb340a951b903348de91e91df58568f3ac1c0386","user":{"login":"rxn1d","id":3824602,"avatar_url":"https://avatars.githubusercontent.com/u/3824602?v=3","gravatar_id":"","url":"https://api.github.com/users/rxn1d","html_url":"https://github.com/rxn1d","followers_url":"https://api.github.com/users/rxn1d/followers","following_url":"https://api.github.com/users/rxn1d/following{/other_user}","gists_url":"https://api.github.com/users/rxn1d/gists{/gist_id}","starred_url":"https://api.github.com/users/rxn1d/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rxn1d/subscriptions","organizations_url":"https://api.github.com/users/rxn1d/orgs","repos_url":"https://api.github.com/users/rxn1d/repos","events_url":"https://api.github.com/users/rxn1d/events{/privacy}","received_events_url":"https://api.github.com/users/rxn1d/received_events","type":"User","site_admin":false},"repo":{"id":62133200,"name":"courses-2-2016","full_name":"rxn1d/courses-2-2016","owner":{"login":"rxn1d","id":3824602,"avatar_url":"https://avatars.githubusercontent.com/u/3824602?v=3","gravatar_id":"","url":"https://api.github.com/users/rxn1d","html_url":"https://github.com/rxn1d","followers_url":"https://api.github.com/users/rxn1d/followers","following_url":"https://api.github.com/users/rxn1d/following{/other_user}","gists_url":"https://api.github.com/users/rxn1d/gists{/gist_id}","starred_url":"https://api.github.com/users/rxn1d/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rxn1d/subscriptions","organizations_url":"https://api.github.com/users/rxn1d/orgs","repos_url":"https://api.github.com/users/rxn1d/repos","events_url":"https://api.github.com/users/rxn1d/events{/privacy}","received_events_url":"https://api.github.com/users/rxn1d/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/rxn1d/courses-2-2016","description":"Java courses materials and resources for group 2-2016","fork":false,"url":"https://api.github.com/repos/rxn1d/courses-2-2016","forks_url":"https://api.github.com/repos/rxn1d/courses-2-2016/forks","keys_url":"https://api.github.com/repos/rxn1d/courses-2-2016/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rxn1d/courses-2-2016/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rxn1d/courses-2-2016/teams","hooks_url":"https://api.github.com/repos/rxn1d/courses-2-2016/hooks","issue_events_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/events{/number}","events_url":"https://api.github.com/repos/rxn1d/courses-2-2016/events","assignees_url":"https://api.github.com/repos/rxn1d/courses-2-2016/assignees{/user}","branches_url":"https://api.github.com/repos/rxn1d/courses-2-2016/branches{/branch}","tags_url":"https://api.github.com/repos/rxn1d/courses-2-2016/tags","blobs_url":"https://api.github.com/repos/rxn1d/courses-2-2016/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rxn1d/courses-2-2016/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rxn1d/courses-2-2016/git/refs{/sha}","trees_url":"https://api.github.com/repos/rxn1d/courses-2-2016/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rxn1d/courses-2-2016/statuses/{sha}","languages_url":"https://api.github.com/repos/rxn1d/courses-2-2016/languages","stargazers_url":"https://api.github.com/repos/rxn1d/courses-2-2016/stargazers","contributors_url":"https://api.github.com/repos/rxn1d/courses-2-2016/contributors","subscribers_url":"https://api.github.com/repos/rxn1d/courses-2-2016/subscribers","subscription_url":"https://api.github.com/repos/rxn1d/courses-2-2016/subscription","commits_url":"https://api.github.com/repos/rxn1d/courses-2-2016/commits{/sha}","git_commits_url":"https://api.github.com/repos/rxn1d/courses-2-2016/git/commits{/sha}","comments_url":"https://api.github.com/repos/rxn1d/courses-2-2016/comments{/number}","issue_comment_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/comments{/number}","contents_url":"https://api.github.com/repos/rxn1d/courses-2-2016/contents/{+path}","compare_url":"https://api.github.com/repos/rxn1d/courses-2-2016/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rxn1d/courses-2-2016/merges","archive_url":"https://api.github.com/repos/rxn1d/courses-2-2016/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rxn1d/courses-2-2016/downloads","issues_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues{/number}","pulls_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls{/number}","milestones_url":"https://api.github.com/repos/rxn1d/courses-2-2016/milestones{/number}","notifications_url":"https://api.github.com/repos/rxn1d/courses-2-2016/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rxn1d/courses-2-2016/labels{/name}","releases_url":"https://api.github.com/repos/rxn1d/courses-2-2016/releases{/id}","deployments_url":"https://api.github.com/repos/rxn1d/courses-2-2016/deployments","created_at":"2016-06-28T10:45:49Z","updated_at":"2016-10-28T12:40:28Z","pushed_at":"2016-11-01T14:34:13Z","git_url":"git://github.com/rxn1d/courses-2-2016.git","ssh_url":"git@github.com:rxn1d/courses-2-2016.git","clone_url":"https://github.com/rxn1d/courses-2-2016.git","svn_url":"https://github.com/rxn1d/courses-2-2016","homepage":"","size":927,"stargazers_count":1,"watchers_count":1,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":2,"forks":15,"open_issues":2,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55"},"html":{"href":"https://github.com/rxn1d/courses-2-2016/pull/55"},"issue":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/55"},"comments":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/55/comments"},"review_comments":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55/comments"},"review_comment":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/55/commits"},"statuses":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/statuses/7572b10b2c36bd9fe1fac822d6115d9d707af4d4"}}}}
{"actor":{"display_login":"rxn1d"}}