{"action":"created","comment":{"url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments/72974153","id":72974153,"diff_hunk":"@@ -8,13 +8,21 @@\n     private float persentPerYear;\n     private int yearsOfCredit;\n \n+<<<<<<< HEAD:module5/src/main/java/com/courses/spalah/Homework/Credit.java\n+    public Credit(float currentCredit, float persentPerYear, int yearsOfCredit) {\n+=======\n     public Credit(float currentCredit, float persentPerYear, int yearsOfCredit){\n+>>>>>>> 068c314f81e2f3510f5d9a981206670dfbbf2895:module6/src/main/java/com/courses/spalah/Homework/bank/Credit.java\n         this.currentCredit = currentCredit;\n         this.persentPerYear = persentPerYear;\n         this.yearsOfCredit = yearsOfCredit;\n     }\n \n+<<<<<<< HEAD:module5/src/main/java/com/courses/spalah/Homework/Credit.java","path":"module6/src/main/java/com/courses/spalah/Homework/bank/Credit.java","position":14,"original_position":14,"commit_id":"59b1eb24b1b40c869af4e0af04597304dbd9ce70","original_commit_id":"59b1eb24b1b40c869af4e0af04597304dbd9ce70","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-08-01T13:06:32Z","updated_at":"2016-08-01T13:06:32Z","html_url":"https://github.com/rxn1d/courses-2-2016/pull/35#discussion_r72974153","pull_request_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35","_links":{"self":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/comments/72974153"},"html":{"href":"https://github.com/rxn1d/courses-2-2016/pull/35#discussion_r72974153"},"pull_request":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35"}}},"pull_request":{"url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35","id":79467149,"html_url":"https://github.com/rxn1d/courses-2-2016/pull/35","diff_url":"https://github.com/rxn1d/courses-2-2016/pull/35.diff","patch_url":"https://github.com/rxn1d/courses-2-2016/pull/35.patch","issue_url":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/35","number":35,"state":"open","locked":false,"title":"ДЗ#7","user":{"login":"artemuskov","id":20248300,"avatar_url":"https://avatars.githubusercontent.com/u/20248300?v=3","gravatar_id":"","url":"https://api.github.com/users/artemuskov","html_url":"https://github.com/artemuskov","followers_url":"https://api.github.com/users/artemuskov/followers","following_url":"https://api.github.com/users/artemuskov/following{/other_user}","gists_url":"https://api.github.com/users/artemuskov/gists{/gist_id}","starred_url":"https://api.github.com/users/artemuskov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artemuskov/subscriptions","organizations_url":"https://api.github.com/users/artemuskov/orgs","repos_url":"https://api.github.com/users/artemuskov/repos","events_url":"https://api.github.com/users/artemuskov/events{/privacy}","received_events_url":"https://api.github.com/users/artemuskov/received_events","type":"User","site_admin":false},"body":"С десериализаторами совсем плохо, даже не знаю в какую сторону копать, так ничего и не получилось (","created_at":"2016-07-30T20:30:15Z","updated_at":"2016-08-01T13:06:32Z","closed_at":null,"merged_at":null,"merge_commit_sha":"71de3d340f9141986073cf5e76e752bcb19ba323","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35/commits","review_comments_url":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35/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/35/comments","statuses_url":"https://api.github.com/repos/rxn1d/courses-2-2016/statuses/59b1eb24b1b40c869af4e0af04597304dbd9ce70","head":{"label":"artemuskov:master","ref":"master","sha":"59b1eb24b1b40c869af4e0af04597304dbd9ce70","user":{"login":"artemuskov","id":20248300,"avatar_url":"https://avatars.githubusercontent.com/u/20248300?v=3","gravatar_id":"","url":"https://api.github.com/users/artemuskov","html_url":"https://github.com/artemuskov","followers_url":"https://api.github.com/users/artemuskov/followers","following_url":"https://api.github.com/users/artemuskov/following{/other_user}","gists_url":"https://api.github.com/users/artemuskov/gists{/gist_id}","starred_url":"https://api.github.com/users/artemuskov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artemuskov/subscriptions","organizations_url":"https://api.github.com/users/artemuskov/orgs","repos_url":"https://api.github.com/users/artemuskov/repos","events_url":"https://api.github.com/users/artemuskov/events{/privacy}","received_events_url":"https://api.github.com/users/artemuskov/received_events","type":"User","site_admin":false},"repo":{"id":62747593,"name":"courses-2-2016","full_name":"artemuskov/courses-2-2016","owner":{"login":"artemuskov","id":20248300,"avatar_url":"https://avatars.githubusercontent.com/u/20248300?v=3","gravatar_id":"","url":"https://api.github.com/users/artemuskov","html_url":"https://github.com/artemuskov","followers_url":"https://api.github.com/users/artemuskov/followers","following_url":"https://api.github.com/users/artemuskov/following{/other_user}","gists_url":"https://api.github.com/users/artemuskov/gists{/gist_id}","starred_url":"https://api.github.com/users/artemuskov/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/artemuskov/subscriptions","organizations_url":"https://api.github.com/users/artemuskov/orgs","repos_url":"https://api.github.com/users/artemuskov/repos","events_url":"https://api.github.com/users/artemuskov/events{/privacy}","received_events_url":"https://api.github.com/users/artemuskov/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/artemuskov/courses-2-2016","description":"Java courses materials and resources for group 2-2106","fork":true,"url":"https://api.github.com/repos/artemuskov/courses-2-2016","forks_url":"https://api.github.com/repos/artemuskov/courses-2-2016/forks","keys_url":"https://api.github.com/repos/artemuskov/courses-2-2016/keys{/key_id}","collaborators_url":"https://api.github.com/repos/artemuskov/courses-2-2016/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/artemuskov/courses-2-2016/teams","hooks_url":"https://api.github.com/repos/artemuskov/courses-2-2016/hooks","issue_events_url":"https://api.github.com/repos/artemuskov/courses-2-2016/issues/events{/number}","events_url":"https://api.github.com/repos/artemuskov/courses-2-2016/events","assignees_url":"https://api.github.com/repos/artemuskov/courses-2-2016/assignees{/user}","branches_url":"https://api.github.com/repos/artemuskov/courses-2-2016/branches{/branch}","tags_url":"https://api.github.com/repos/artemuskov/courses-2-2016/tags","blobs_url":"https://api.github.com/repos/artemuskov/courses-2-2016/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/artemuskov/courses-2-2016/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/artemuskov/courses-2-2016/git/refs{/sha}","trees_url":"https://api.github.com/repos/artemuskov/courses-2-2016/git/trees{/sha}","statuses_url":"https://api.github.com/repos/artemuskov/courses-2-2016/statuses/{sha}","languages_url":"https://api.github.com/repos/artemuskov/courses-2-2016/languages","stargazers_url":"https://api.github.com/repos/artemuskov/courses-2-2016/stargazers","contributors_url":"https://api.github.com/repos/artemuskov/courses-2-2016/contributors","subscribers_url":"https://api.github.com/repos/artemuskov/courses-2-2016/subscribers","subscription_url":"https://api.github.com/repos/artemuskov/courses-2-2016/subscription","commits_url":"https://api.github.com/repos/artemuskov/courses-2-2016/commits{/sha}","git_commits_url":"https://api.github.com/repos/artemuskov/courses-2-2016/git/commits{/sha}","comments_url":"https://api.github.com/repos/artemuskov/courses-2-2016/comments{/number}","issue_comment_url":"https://api.github.com/repos/artemuskov/courses-2-2016/issues/comments{/number}","contents_url":"https://api.github.com/repos/artemuskov/courses-2-2016/contents/{+path}","compare_url":"https://api.github.com/repos/artemuskov/courses-2-2016/compare/{base}...{head}","merges_url":"https://api.github.com/repos/artemuskov/courses-2-2016/merges","archive_url":"https://api.github.com/repos/artemuskov/courses-2-2016/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/artemuskov/courses-2-2016/downloads","issues_url":"https://api.github.com/repos/artemuskov/courses-2-2016/issues{/number}","pulls_url":"https://api.github.com/repos/artemuskov/courses-2-2016/pulls{/number}","milestones_url":"https://api.github.com/repos/artemuskov/courses-2-2016/milestones{/number}","notifications_url":"https://api.github.com/repos/artemuskov/courses-2-2016/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/artemuskov/courses-2-2016/labels{/name}","releases_url":"https://api.github.com/repos/artemuskov/courses-2-2016/releases{/id}","deployments_url":"https://api.github.com/repos/artemuskov/courses-2-2016/deployments","created_at":"2016-07-06T19:22:56Z","updated_at":"2016-07-06T19:22:57Z","pushed_at":"2016-07-30T20:27:56Z","git_url":"git://github.com/artemuskov/courses-2-2016.git","ssh_url":"git@github.com:artemuskov/courses-2-2016.git","clone_url":"https://github.com/artemuskov/courses-2-2016.git","svn_url":"https://github.com/artemuskov/courses-2-2016","homepage":"","size":124,"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:courses/artemuskov","ref":"courses/artemuskov","sha":"207b4fad8b6b980235e33ccb9de86da0d077d00e","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-2106","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-07-14T18:06:58Z","pushed_at":"2016-07-31T20:33:57Z","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":253,"stargazers_count":1,"watchers_count":1,"language":"Java","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":14,"mirror_url":null,"open_issues_count":5,"forks":14,"open_issues":5,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35"},"html":{"href":"https://github.com/rxn1d/courses-2-2016/pull/35"},"issue":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/35"},"comments":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/issues/35/comments"},"review_comments":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/pulls/35/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/35/commits"},"statuses":{"href":"https://api.github.com/repos/rxn1d/courses-2-2016/statuses/59b1eb24b1b40c869af4e0af04597304dbd9ce70"}}}}
{"actor":{"display_login":"rxn1d"}}