{"action":"created","comment":{"url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/comments/34202944","id":34202944,"diff_hunk":"@@ -1,8 +1,14 @@\n+<<<<<<< HEAD","path":"app/views/employers/show.html.erb","position":1,"original_position":1,"commit_id":"c8d4442af4802d3b990d4bed00895290fe7aebef","original_commit_id":"c8d4442af4802d3b990d4bed00895290fe7aebef","user":{"login":"kevinmichaelchen","id":5129994,"avatar_url":"https://avatars.githubusercontent.com/u/5129994?v=3","gravatar_id":"","url":"https://api.github.com/users/kevinmichaelchen","html_url":"https://github.com/kevinmichaelchen","followers_url":"https://api.github.com/users/kevinmichaelchen/followers","following_url":"https://api.github.com/users/kevinmichaelchen/following{/other_user}","gists_url":"https://api.github.com/users/kevinmichaelchen/gists{/gist_id}","starred_url":"https://api.github.com/users/kevinmichaelchen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kevinmichaelchen/subscriptions","organizations_url":"https://api.github.com/users/kevinmichaelchen/orgs","repos_url":"https://api.github.com/users/kevinmichaelchen/repos","events_url":"https://api.github.com/users/kevinmichaelchen/events{/privacy}","received_events_url":"https://api.github.com/users/kevinmichaelchen/received_events","type":"User","site_admin":false},"body":"oops","created_at":"2015-07-08T21:49:45Z","updated_at":"2015-07-08T21:49:45Z","html_url":"https://github.com/Niupiao/Watchmen-Property/pull/17#discussion_r34202944","pull_request_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17","_links":{"self":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/comments/34202944"},"html":{"href":"https://github.com/Niupiao/Watchmen-Property/pull/17#discussion_r34202944"},"pull_request":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17"}}},"pull_request":{"url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17","id":39520643,"html_url":"https://github.com/Niupiao/Watchmen-Property/pull/17","diff_url":"https://github.com/Niupiao/Watchmen-Property/pull/17.diff","patch_url":"https://github.com/Niupiao/Watchmen-Property/pull/17.patch","issue_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/17","number":17,"state":"closed","locked":false,"title":"Feature/rkwon/task","user":{"login":"BenDrews","id":12362041,"avatar_url":"https://avatars.githubusercontent.com/u/12362041?v=3","gravatar_id":"","url":"https://api.github.com/users/BenDrews","html_url":"https://github.com/BenDrews","followers_url":"https://api.github.com/users/BenDrews/followers","following_url":"https://api.github.com/users/BenDrews/following{/other_user}","gists_url":"https://api.github.com/users/BenDrews/gists{/gist_id}","starred_url":"https://api.github.com/users/BenDrews/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BenDrews/subscriptions","organizations_url":"https://api.github.com/users/BenDrews/orgs","repos_url":"https://api.github.com/users/BenDrews/repos","events_url":"https://api.github.com/users/BenDrews/events{/privacy}","received_events_url":"https://api.github.com/users/BenDrews/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-07-08T20:39:26Z","updated_at":"2015-07-08T21:49:45Z","closed_at":"2015-07-08T21:10:00Z","merged_at":"2015-07-08T21:10:00Z","merge_commit_sha":"770868d08c0442d994be6a1529d01847076ea54f","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17/commits","review_comments_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17/comments","review_comment_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/17/comments","statuses_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/statuses/c8d4442af4802d3b990d4bed00895290fe7aebef","head":{"label":"Niupiao:feature/rkwon/task","ref":"feature/rkwon/task","sha":"c8d4442af4802d3b990d4bed00895290fe7aebef","user":{"login":"Niupiao","id":11048848,"avatar_url":"https://avatars.githubusercontent.com/u/11048848?v=3","gravatar_id":"","url":"https://api.github.com/users/Niupiao","html_url":"https://github.com/Niupiao","followers_url":"https://api.github.com/users/Niupiao/followers","following_url":"https://api.github.com/users/Niupiao/following{/other_user}","gists_url":"https://api.github.com/users/Niupiao/gists{/gist_id}","starred_url":"https://api.github.com/users/Niupiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Niupiao/subscriptions","organizations_url":"https://api.github.com/users/Niupiao/orgs","repos_url":"https://api.github.com/users/Niupiao/repos","events_url":"https://api.github.com/users/Niupiao/events{/privacy}","received_events_url":"https://api.github.com/users/Niupiao/received_events","type":"Organization","site_admin":false},"repo":{"id":38380009,"name":"Watchmen-Property","full_name":"Niupiao/Watchmen-Property","owner":{"login":"Niupiao","id":11048848,"avatar_url":"https://avatars.githubusercontent.com/u/11048848?v=3","gravatar_id":"","url":"https://api.github.com/users/Niupiao","html_url":"https://github.com/Niupiao","followers_url":"https://api.github.com/users/Niupiao/followers","following_url":"https://api.github.com/users/Niupiao/following{/other_user}","gists_url":"https://api.github.com/users/Niupiao/gists{/gist_id}","starred_url":"https://api.github.com/users/Niupiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Niupiao/subscriptions","organizations_url":"https://api.github.com/users/Niupiao/orgs","repos_url":"https://api.github.com/users/Niupiao/repos","events_url":"https://api.github.com/users/Niupiao/events{/privacy}","received_events_url":"https://api.github.com/users/Niupiao/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Niupiao/Watchmen-Property","description":"","fork":false,"url":"https://api.github.com/repos/Niupiao/Watchmen-Property","forks_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/forks","keys_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/teams","hooks_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/hooks","issue_events_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/events{/number}","events_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/events","assignees_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/assignees{/user}","branches_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/branches{/branch}","tags_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/tags","blobs_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/refs{/sha}","trees_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/statuses/{sha}","languages_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/languages","stargazers_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/stargazers","contributors_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/contributors","subscribers_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/subscribers","subscription_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/subscription","commits_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/commits{/sha}","git_commits_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/commits{/sha}","comments_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/comments{/number}","issue_comment_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/comments{/number}","contents_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/contents/{+path}","compare_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/merges","archive_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/downloads","issues_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues{/number}","pulls_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls{/number}","milestones_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/milestones{/number}","notifications_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/labels{/name}","releases_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/releases{/id}","created_at":"2015-07-01T15:49:29Z","updated_at":"2015-07-08T16:02:43Z","pushed_at":"2015-07-08T21:10:02Z","git_url":"git://github.com/Niupiao/Watchmen-Property.git","ssh_url":"git@github.com:Niupiao/Watchmen-Property.git","clone_url":"https://github.com/Niupiao/Watchmen-Property.git","svn_url":"https://github.com/Niupiao/Watchmen-Property","homepage":null,"size":284,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"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":"staging"}},"base":{"label":"Niupiao:staging","ref":"staging","sha":"6a06fcda5fd6f03fd47ce969300e9999ec59de1d","user":{"login":"Niupiao","id":11048848,"avatar_url":"https://avatars.githubusercontent.com/u/11048848?v=3","gravatar_id":"","url":"https://api.github.com/users/Niupiao","html_url":"https://github.com/Niupiao","followers_url":"https://api.github.com/users/Niupiao/followers","following_url":"https://api.github.com/users/Niupiao/following{/other_user}","gists_url":"https://api.github.com/users/Niupiao/gists{/gist_id}","starred_url":"https://api.github.com/users/Niupiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Niupiao/subscriptions","organizations_url":"https://api.github.com/users/Niupiao/orgs","repos_url":"https://api.github.com/users/Niupiao/repos","events_url":"https://api.github.com/users/Niupiao/events{/privacy}","received_events_url":"https://api.github.com/users/Niupiao/received_events","type":"Organization","site_admin":false},"repo":{"id":38380009,"name":"Watchmen-Property","full_name":"Niupiao/Watchmen-Property","owner":{"login":"Niupiao","id":11048848,"avatar_url":"https://avatars.githubusercontent.com/u/11048848?v=3","gravatar_id":"","url":"https://api.github.com/users/Niupiao","html_url":"https://github.com/Niupiao","followers_url":"https://api.github.com/users/Niupiao/followers","following_url":"https://api.github.com/users/Niupiao/following{/other_user}","gists_url":"https://api.github.com/users/Niupiao/gists{/gist_id}","starred_url":"https://api.github.com/users/Niupiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Niupiao/subscriptions","organizations_url":"https://api.github.com/users/Niupiao/orgs","repos_url":"https://api.github.com/users/Niupiao/repos","events_url":"https://api.github.com/users/Niupiao/events{/privacy}","received_events_url":"https://api.github.com/users/Niupiao/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Niupiao/Watchmen-Property","description":"","fork":false,"url":"https://api.github.com/repos/Niupiao/Watchmen-Property","forks_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/forks","keys_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/teams","hooks_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/hooks","issue_events_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/events{/number}","events_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/events","assignees_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/assignees{/user}","branches_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/branches{/branch}","tags_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/tags","blobs_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/refs{/sha}","trees_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/statuses/{sha}","languages_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/languages","stargazers_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/stargazers","contributors_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/contributors","subscribers_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/subscribers","subscription_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/subscription","commits_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/commits{/sha}","git_commits_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/git/commits{/sha}","comments_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/comments{/number}","issue_comment_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/comments{/number}","contents_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/contents/{+path}","compare_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/merges","archive_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/downloads","issues_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues{/number}","pulls_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls{/number}","milestones_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/milestones{/number}","notifications_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/labels{/name}","releases_url":"https://api.github.com/repos/Niupiao/Watchmen-Property/releases{/id}","created_at":"2015-07-01T15:49:29Z","updated_at":"2015-07-08T16:02:43Z","pushed_at":"2015-07-08T21:10:02Z","git_url":"git://github.com/Niupiao/Watchmen-Property.git","ssh_url":"git@github.com:Niupiao/Watchmen-Property.git","clone_url":"https://github.com/Niupiao/Watchmen-Property.git","svn_url":"https://github.com/Niupiao/Watchmen-Property","homepage":null,"size":284,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"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":"staging"}},"_links":{"self":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17"},"html":{"href":"https://github.com/Niupiao/Watchmen-Property/pull/17"},"issue":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/17"},"comments":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/issues/17/comments"},"review_comments":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17/comments"},"review_comment":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/pulls/17/commits"},"statuses":{"href":"https://api.github.com/repos/Niupiao/Watchmen-Property/statuses/c8d4442af4802d3b990d4bed00895290fe7aebef"}}}}