{"action":"created","comment":{"url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/comments/69526855","id":69526855,"diff_hunk":"@@ -8,7 +8,15 @@ exports.categories = function (callback) {\n \r\n exports.addCategory = function (data, callback) {\r\n   db.connection.collection(\"categories\").insert({\r\n+<<<<<<< Updated upstream\r","path":"lib/categories.js","position":4,"original_position":4,"commit_id":"e10adb33c9eaeb0db9a0339d40f9fac3469be0d0","original_commit_id":"e10adb33c9eaeb0db9a0339d40f9fac3469be0d0","user":{"login":"Garffan","id":4301937,"avatar_url":"https://avatars.githubusercontent.com/u/4301937?v=3","gravatar_id":"","url":"https://api.github.com/users/Garffan","html_url":"https://github.com/Garffan","followers_url":"https://api.github.com/users/Garffan/followers","following_url":"https://api.github.com/users/Garffan/following{/other_user}","gists_url":"https://api.github.com/users/Garffan/gists{/gist_id}","starred_url":"https://api.github.com/users/Garffan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Garffan/subscriptions","organizations_url":"https://api.github.com/users/Garffan/orgs","repos_url":"https://api.github.com/users/Garffan/repos","events_url":"https://api.github.com/users/Garffan/events{/privacy}","received_events_url":"https://api.github.com/users/Garffan/received_events","type":"User","site_admin":false},"body":"<<<< - вот это вот лишнее","created_at":"2016-07-05T08:50:00Z","updated_at":"2016-07-05T08:50:00Z","html_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25#discussion_r69526855","pull_request_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25","_links":{"self":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/comments/69526855"},"html":{"href":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25#discussion_r69526855"},"pull_request":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25"}}},"pull_request":{"url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25","id":76179716,"html_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25","diff_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25.diff","patch_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25.patch","issue_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/25","number":25,"state":"open","locked":false,"title":"функции создания и обновления пользователя","user":{"login":"usingnamespaceSystem","id":19737439,"avatar_url":"https://avatars.githubusercontent.com/u/19737439?v=3","gravatar_id":"","url":"https://api.github.com/users/usingnamespaceSystem","html_url":"https://github.com/usingnamespaceSystem","followers_url":"https://api.github.com/users/usingnamespaceSystem/followers","following_url":"https://api.github.com/users/usingnamespaceSystem/following{/other_user}","gists_url":"https://api.github.com/users/usingnamespaceSystem/gists{/gist_id}","starred_url":"https://api.github.com/users/usingnamespaceSystem/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/usingnamespaceSystem/subscriptions","organizations_url":"https://api.github.com/users/usingnamespaceSystem/orgs","repos_url":"https://api.github.com/users/usingnamespaceSystem/repos","events_url":"https://api.github.com/users/usingnamespaceSystem/events{/privacy}","received_events_url":"https://api.github.com/users/usingnamespaceSystem/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-07-04T15:35:29Z","updated_at":"2016-07-05T08:50:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"e84ae09dd17fabb95ce6ec7faa910a3a21effadc","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25/commits","review_comments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25/comments","review_comment_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/comments{/number}","comments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/25/comments","statuses_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/statuses/e10adb33c9eaeb0db9a0339d40f9fac3469be0d0","head":{"label":"KubSAU-DevClassroom:mike-n-kate-issue#13","ref":"mike-n-kate-issue#13","sha":"e10adb33c9eaeb0db9a0339d40f9fac3469be0d0","user":{"login":"KubSAU-DevClassroom","id":20110326,"avatar_url":"https://avatars.githubusercontent.com/u/20110326?v=3","gravatar_id":"","url":"https://api.github.com/users/KubSAU-DevClassroom","html_url":"https://github.com/KubSAU-DevClassroom","followers_url":"https://api.github.com/users/KubSAU-DevClassroom/followers","following_url":"https://api.github.com/users/KubSAU-DevClassroom/following{/other_user}","gists_url":"https://api.github.com/users/KubSAU-DevClassroom/gists{/gist_id}","starred_url":"https://api.github.com/users/KubSAU-DevClassroom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KubSAU-DevClassroom/subscriptions","organizations_url":"https://api.github.com/users/KubSAU-DevClassroom/orgs","repos_url":"https://api.github.com/users/KubSAU-DevClassroom/repos","events_url":"https://api.github.com/users/KubSAU-DevClassroom/events{/privacy}","received_events_url":"https://api.github.com/users/KubSAU-DevClassroom/received_events","type":"Organization","site_admin":false},"repo":{"id":61805344,"name":"dreamlist-cloud","full_name":"KubSAU-DevClassroom/dreamlist-cloud","owner":{"login":"KubSAU-DevClassroom","id":20110326,"avatar_url":"https://avatars.githubusercontent.com/u/20110326?v=3","gravatar_id":"","url":"https://api.github.com/users/KubSAU-DevClassroom","html_url":"https://github.com/KubSAU-DevClassroom","followers_url":"https://api.github.com/users/KubSAU-DevClassroom/followers","following_url":"https://api.github.com/users/KubSAU-DevClassroom/following{/other_user}","gists_url":"https://api.github.com/users/KubSAU-DevClassroom/gists{/gist_id}","starred_url":"https://api.github.com/users/KubSAU-DevClassroom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KubSAU-DevClassroom/subscriptions","organizations_url":"https://api.github.com/users/KubSAU-DevClassroom/orgs","repos_url":"https://api.github.com/users/KubSAU-DevClassroom/repos","events_url":"https://api.github.com/users/KubSAU-DevClassroom/events{/privacy}","received_events_url":"https://api.github.com/users/KubSAU-DevClassroom/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud","description":"","fork":false,"url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud","forks_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/forks","keys_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/keys{/key_id}","collaborators_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/teams","hooks_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/hooks","issue_events_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/events{/number}","events_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/events","assignees_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/assignees{/user}","branches_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/branches{/branch}","tags_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/tags","blobs_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/refs{/sha}","trees_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/trees{/sha}","statuses_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/statuses/{sha}","languages_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/languages","stargazers_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/stargazers","contributors_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/contributors","subscribers_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/subscribers","subscription_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/subscription","commits_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/commits{/sha}","git_commits_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/commits{/sha}","comments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/comments{/number}","issue_comment_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/comments{/number}","contents_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/contents/{+path}","compare_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/compare/{base}...{head}","merges_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/merges","archive_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/downloads","issues_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues{/number}","pulls_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls{/number}","milestones_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/milestones{/number}","notifications_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/labels{/name}","releases_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/releases{/id}","deployments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/deployments","created_at":"2016-06-23T12:59:15Z","updated_at":"2016-06-23T13:17:09Z","pushed_at":"2016-07-04T15:35:47Z","git_url":"git://github.com/KubSAU-DevClassroom/dreamlist-cloud.git","ssh_url":"git@github.com:KubSAU-DevClassroom/dreamlist-cloud.git","clone_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud.git","svn_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud","homepage":null,"size":18,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":17,"forks":1,"open_issues":17,"watchers":0,"default_branch":"master"}},"base":{"label":"KubSAU-DevClassroom:master","ref":"master","sha":"7ebb016487f711ad7cc0aa3cb4bc09579c290a9c","user":{"login":"KubSAU-DevClassroom","id":20110326,"avatar_url":"https://avatars.githubusercontent.com/u/20110326?v=3","gravatar_id":"","url":"https://api.github.com/users/KubSAU-DevClassroom","html_url":"https://github.com/KubSAU-DevClassroom","followers_url":"https://api.github.com/users/KubSAU-DevClassroom/followers","following_url":"https://api.github.com/users/KubSAU-DevClassroom/following{/other_user}","gists_url":"https://api.github.com/users/KubSAU-DevClassroom/gists{/gist_id}","starred_url":"https://api.github.com/users/KubSAU-DevClassroom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KubSAU-DevClassroom/subscriptions","organizations_url":"https://api.github.com/users/KubSAU-DevClassroom/orgs","repos_url":"https://api.github.com/users/KubSAU-DevClassroom/repos","events_url":"https://api.github.com/users/KubSAU-DevClassroom/events{/privacy}","received_events_url":"https://api.github.com/users/KubSAU-DevClassroom/received_events","type":"Organization","site_admin":false},"repo":{"id":61805344,"name":"dreamlist-cloud","full_name":"KubSAU-DevClassroom/dreamlist-cloud","owner":{"login":"KubSAU-DevClassroom","id":20110326,"avatar_url":"https://avatars.githubusercontent.com/u/20110326?v=3","gravatar_id":"","url":"https://api.github.com/users/KubSAU-DevClassroom","html_url":"https://github.com/KubSAU-DevClassroom","followers_url":"https://api.github.com/users/KubSAU-DevClassroom/followers","following_url":"https://api.github.com/users/KubSAU-DevClassroom/following{/other_user}","gists_url":"https://api.github.com/users/KubSAU-DevClassroom/gists{/gist_id}","starred_url":"https://api.github.com/users/KubSAU-DevClassroom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KubSAU-DevClassroom/subscriptions","organizations_url":"https://api.github.com/users/KubSAU-DevClassroom/orgs","repos_url":"https://api.github.com/users/KubSAU-DevClassroom/repos","events_url":"https://api.github.com/users/KubSAU-DevClassroom/events{/privacy}","received_events_url":"https://api.github.com/users/KubSAU-DevClassroom/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud","description":"","fork":false,"url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud","forks_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/forks","keys_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/keys{/key_id}","collaborators_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/teams","hooks_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/hooks","issue_events_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/events{/number}","events_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/events","assignees_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/assignees{/user}","branches_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/branches{/branch}","tags_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/tags","blobs_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/refs{/sha}","trees_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/trees{/sha}","statuses_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/statuses/{sha}","languages_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/languages","stargazers_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/stargazers","contributors_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/contributors","subscribers_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/subscribers","subscription_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/subscription","commits_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/commits{/sha}","git_commits_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/git/commits{/sha}","comments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/comments{/number}","issue_comment_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/comments{/number}","contents_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/contents/{+path}","compare_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/compare/{base}...{head}","merges_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/merges","archive_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/downloads","issues_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues{/number}","pulls_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls{/number}","milestones_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/milestones{/number}","notifications_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/labels{/name}","releases_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/releases{/id}","deployments_url":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/deployments","created_at":"2016-06-23T12:59:15Z","updated_at":"2016-06-23T13:17:09Z","pushed_at":"2016-07-04T15:35:47Z","git_url":"git://github.com/KubSAU-DevClassroom/dreamlist-cloud.git","ssh_url":"git@github.com:KubSAU-DevClassroom/dreamlist-cloud.git","clone_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud.git","svn_url":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud","homepage":null,"size":18,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":17,"forks":1,"open_issues":17,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25"},"html":{"href":"https://github.com/KubSAU-DevClassroom/dreamlist-cloud/pull/25"},"issue":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/25"},"comments":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/issues/25/comments"},"review_comments":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25/comments"},"review_comment":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/pulls/25/commits"},"statuses":{"href":"https://api.github.com/repos/KubSAU-DevClassroom/dreamlist-cloud/statuses/e10adb33c9eaeb0db9a0339d40f9fac3469be0d0"}}}}
{"actor":{"display_login":"Garffan"}}