{"action":"created","comment":{"url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/comments/232451905","pull_request_review_id":173661314,"id":232451905,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIzMjQ1MTkwNQ==","diff_hunk":"@@ -584,4 +653,15 @@ e.g. `redo`\n * *Clear* : `clear`\n * *Help* : `help`\n * *History* : `history`\n-\n+<<<<<<< HEAD","path":"docs/UserGuide.adoc","position":216,"original_position":216,"commit_id":"1d2b818a7f16464c419fc4e80427f9ff312e75c6","original_commit_id":"0ec816b5ff721ab03d15a1dbb615a38bf49c9f38","user":{"login":"xueyantian","id":33081392,"node_id":"MDQ6VXNlcjMzMDgxMzky","avatar_url":"https://avatars2.githubusercontent.com/u/33081392?v=4","gravatar_id":"","url":"https://api.github.com/users/xueyantian","html_url":"https://github.com/xueyantian","followers_url":"https://api.github.com/users/xueyantian/followers","following_url":"https://api.github.com/users/xueyantian/following{/other_user}","gists_url":"https://api.github.com/users/xueyantian/gists{/gist_id}","starred_url":"https://api.github.com/users/xueyantian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xueyantian/subscriptions","organizations_url":"https://api.github.com/users/xueyantian/orgs","repos_url":"https://api.github.com/users/xueyantian/repos","events_url":"https://api.github.com/users/xueyantian/events{/privacy}","received_events_url":"https://api.github.com/users/xueyantian/received_events","type":"User","site_admin":false},"body":"remove <<<<<<< HEAD","created_at":"2018-11-10T13:18:25Z","updated_at":"2018-11-10T13:41:25Z","html_url":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182#discussion_r232451905","pull_request_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/comments/232451905"},"html":{"href":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182#discussion_r232451905"},"pull_request":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182"}}},"pull_request":{"url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182","id":229888446,"node_id":"MDExOlB1bGxSZXF1ZXN0MjI5ODg4NDQ2","html_url":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182","diff_url":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182.diff","patch_url":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182.patch","issue_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/182","number":182,"state":"open","locked":false,"title":" Edit EditCommands to fit InsertPersonCommand","user":{"login":"KongZijin","id":34978174,"node_id":"MDQ6VXNlcjM0OTc4MTc0","avatar_url":"https://avatars0.githubusercontent.com/u/34978174?v=4","gravatar_id":"","url":"https://api.github.com/users/KongZijin","html_url":"https://github.com/KongZijin","followers_url":"https://api.github.com/users/KongZijin/followers","following_url":"https://api.github.com/users/KongZijin/following{/other_user}","gists_url":"https://api.github.com/users/KongZijin/gists{/gist_id}","starred_url":"https://api.github.com/users/KongZijin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KongZijin/subscriptions","organizations_url":"https://api.github.com/users/KongZijin/orgs","repos_url":"https://api.github.com/users/KongZijin/repos","events_url":"https://api.github.com/users/KongZijin/events{/privacy}","received_events_url":"https://api.github.com/users/KongZijin/received_events","type":"User","site_admin":false},"body":"1. Edit EditCommands to fit InsertPersonCommand\r\n2. edit Dev Guide\r\n3. minor change to ExportCommand","created_at":"2018-11-10T13:02:22Z","updated_at":"2018-11-10T13:41:25Z","closed_at":null,"merged_at":null,"merge_commit_sha":"438de755c949593b8e5e8d63e89e90165d534c84","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":{"url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/milestones/5","html_url":"https://github.com/CS2103-AY1819S1-W10-1/main/milestone/5","labels_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/milestones/5/labels","id":3618414,"node_id":"MDk6TWlsZXN0b25lMzYxODQxNA==","number":5,"title":"v1.4","description":"Final project submission","creator":{"login":"alistairong","id":28925565,"node_id":"MDQ6VXNlcjI4OTI1NTY1","avatar_url":"https://avatars0.githubusercontent.com/u/28925565?v=4","gravatar_id":"","url":"https://api.github.com/users/alistairong","html_url":"https://github.com/alistairong","followers_url":"https://api.github.com/users/alistairong/followers","following_url":"https://api.github.com/users/alistairong/following{/other_user}","gists_url":"https://api.github.com/users/alistairong/gists{/gist_id}","starred_url":"https://api.github.com/users/alistairong/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/alistairong/subscriptions","organizations_url":"https://api.github.com/users/alistairong/orgs","repos_url":"https://api.github.com/users/alistairong/repos","events_url":"https://api.github.com/users/alistairong/events{/privacy}","received_events_url":"https://api.github.com/users/alistairong/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":5,"state":"open","created_at":"2018-09-03T15:36:47Z","updated_at":"2018-11-10T13:02:22Z","due_on":"2018-11-11T08:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182/commits","review_comments_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182/comments","review_comment_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/comments{/number}","comments_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/182/comments","statuses_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/statuses/1d2b818a7f16464c419fc4e80427f9ff312e75c6","head":{"label":"KongZijin:master","ref":"master","sha":"1d2b818a7f16464c419fc4e80427f9ff312e75c6","user":{"login":"KongZijin","id":34978174,"node_id":"MDQ6VXNlcjM0OTc4MTc0","avatar_url":"https://avatars0.githubusercontent.com/u/34978174?v=4","gravatar_id":"","url":"https://api.github.com/users/KongZijin","html_url":"https://github.com/KongZijin","followers_url":"https://api.github.com/users/KongZijin/followers","following_url":"https://api.github.com/users/KongZijin/following{/other_user}","gists_url":"https://api.github.com/users/KongZijin/gists{/gist_id}","starred_url":"https://api.github.com/users/KongZijin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KongZijin/subscriptions","organizations_url":"https://api.github.com/users/KongZijin/orgs","repos_url":"https://api.github.com/users/KongZijin/repos","events_url":"https://api.github.com/users/KongZijin/events{/privacy}","received_events_url":"https://api.github.com/users/KongZijin/received_events","type":"User","site_admin":false},"repo":{"id":149238595,"node_id":"MDEwOlJlcG9zaXRvcnkxNDkyMzg1OTU=","name":"main","full_name":"KongZijin/main","private":false,"owner":{"login":"KongZijin","id":34978174,"node_id":"MDQ6VXNlcjM0OTc4MTc0","avatar_url":"https://avatars0.githubusercontent.com/u/34978174?v=4","gravatar_id":"","url":"https://api.github.com/users/KongZijin","html_url":"https://github.com/KongZijin","followers_url":"https://api.github.com/users/KongZijin/followers","following_url":"https://api.github.com/users/KongZijin/following{/other_user}","gists_url":"https://api.github.com/users/KongZijin/gists{/gist_id}","starred_url":"https://api.github.com/users/KongZijin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KongZijin/subscriptions","organizations_url":"https://api.github.com/users/KongZijin/orgs","repos_url":"https://api.github.com/users/KongZijin/repos","events_url":"https://api.github.com/users/KongZijin/events{/privacy}","received_events_url":"https://api.github.com/users/KongZijin/received_events","type":"User","site_admin":false},"html_url":"https://github.com/KongZijin/main","description":":ab::four: Address Book sample application (Level 4)","fork":true,"url":"https://api.github.com/repos/KongZijin/main","forks_url":"https://api.github.com/repos/KongZijin/main/forks","keys_url":"https://api.github.com/repos/KongZijin/main/keys{/key_id}","collaborators_url":"https://api.github.com/repos/KongZijin/main/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/KongZijin/main/teams","hooks_url":"https://api.github.com/repos/KongZijin/main/hooks","issue_events_url":"https://api.github.com/repos/KongZijin/main/issues/events{/number}","events_url":"https://api.github.com/repos/KongZijin/main/events","assignees_url":"https://api.github.com/repos/KongZijin/main/assignees{/user}","branches_url":"https://api.github.com/repos/KongZijin/main/branches{/branch}","tags_url":"https://api.github.com/repos/KongZijin/main/tags","blobs_url":"https://api.github.com/repos/KongZijin/main/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/KongZijin/main/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/KongZijin/main/git/refs{/sha}","trees_url":"https://api.github.com/repos/KongZijin/main/git/trees{/sha}","statuses_url":"https://api.github.com/repos/KongZijin/main/statuses/{sha}","languages_url":"https://api.github.com/repos/KongZijin/main/languages","stargazers_url":"https://api.github.com/repos/KongZijin/main/stargazers","contributors_url":"https://api.github.com/repos/KongZijin/main/contributors","subscribers_url":"https://api.github.com/repos/KongZijin/main/subscribers","subscription_url":"https://api.github.com/repos/KongZijin/main/subscription","commits_url":"https://api.github.com/repos/KongZijin/main/commits{/sha}","git_commits_url":"https://api.github.com/repos/KongZijin/main/git/commits{/sha}","comments_url":"https://api.github.com/repos/KongZijin/main/comments{/number}","issue_comment_url":"https://api.github.com/repos/KongZijin/main/issues/comments{/number}","contents_url":"https://api.github.com/repos/KongZijin/main/contents/{+path}","compare_url":"https://api.github.com/repos/KongZijin/main/compare/{base}...{head}","merges_url":"https://api.github.com/repos/KongZijin/main/merges","archive_url":"https://api.github.com/repos/KongZijin/main/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/KongZijin/main/downloads","issues_url":"https://api.github.com/repos/KongZijin/main/issues{/number}","pulls_url":"https://api.github.com/repos/KongZijin/main/pulls{/number}","milestones_url":"https://api.github.com/repos/KongZijin/main/milestones{/number}","notifications_url":"https://api.github.com/repos/KongZijin/main/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/KongZijin/main/labels{/name}","releases_url":"https://api.github.com/repos/KongZijin/main/releases{/id}","deployments_url":"https://api.github.com/repos/KongZijin/main/deployments","created_at":"2018-09-18T06:21:53Z","updated_at":"2018-11-10T13:17:29Z","pushed_at":"2018-11-10T13:17:27Z","git_url":"git://github.com/KongZijin/main.git","ssh_url":"git@github.com:KongZijin/main.git","clone_url":"https://github.com/KongZijin/main.git","svn_url":"https://github.com/KongZijin/main","homepage":"https://se-edu.github.io/addressbook-level4","size":20419,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"CS2103-AY1819S1-W10-1:master","ref":"master","sha":"7076d8b2767347e0f5f3953cfc3a2e5c5bca01b7","user":{"login":"CS2103-AY1819S1-W10-1","id":42941198,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQyOTQxMTk4","avatar_url":"https://avatars3.githubusercontent.com/u/42941198?v=4","gravatar_id":"","url":"https://api.github.com/users/CS2103-AY1819S1-W10-1","html_url":"https://github.com/CS2103-AY1819S1-W10-1","followers_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/followers","following_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/following{/other_user}","gists_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/gists{/gist_id}","starred_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/subscriptions","organizations_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/orgs","repos_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/repos","events_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/events{/privacy}","received_events_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/received_events","type":"Organization","site_admin":false},"repo":{"id":147220532,"node_id":"MDEwOlJlcG9zaXRvcnkxNDcyMjA1MzI=","name":"main","full_name":"CS2103-AY1819S1-W10-1/main","private":false,"owner":{"login":"CS2103-AY1819S1-W10-1","id":42941198,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQyOTQxMTk4","avatar_url":"https://avatars3.githubusercontent.com/u/42941198?v=4","gravatar_id":"","url":"https://api.github.com/users/CS2103-AY1819S1-W10-1","html_url":"https://github.com/CS2103-AY1819S1-W10-1","followers_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/followers","following_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/following{/other_user}","gists_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/gists{/gist_id}","starred_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/subscriptions","organizations_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/orgs","repos_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/repos","events_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/events{/privacy}","received_events_url":"https://api.github.com/users/CS2103-AY1819S1-W10-1/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/CS2103-AY1819S1-W10-1/main","description":"TheTracker Application","fork":true,"url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main","forks_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/forks","keys_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/teams","hooks_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/hooks","issue_events_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/events{/number}","events_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/events","assignees_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/assignees{/user}","branches_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/branches{/branch}","tags_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/tags","blobs_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/git/refs{/sha}","trees_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/statuses/{sha}","languages_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/languages","stargazers_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/stargazers","contributors_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/contributors","subscribers_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/subscribers","subscription_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/subscription","commits_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/commits{/sha}","git_commits_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/git/commits{/sha}","comments_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/comments{/number}","issue_comment_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/comments{/number}","contents_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/contents/{+path}","compare_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/merges","archive_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/downloads","issues_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues{/number}","pulls_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls{/number}","milestones_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/milestones{/number}","notifications_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/labels{/name}","releases_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/releases{/id}","deployments_url":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/deployments","created_at":"2018-09-03T15:05:17Z","updated_at":"2018-11-10T11:57:25Z","pushed_at":"2018-11-10T13:17:29Z","git_url":"git://github.com/CS2103-AY1819S1-W10-1/main.git","ssh_url":"git@github.com:CS2103-AY1819S1-W10-1/main.git","clone_url":"https://github.com/CS2103-AY1819S1-W10-1/main.git","svn_url":"https://github.com/CS2103-AY1819S1-W10-1/main","homepage":"https://github.com/CS2103-AY1819S1-W10-1/main","size":20243,"stargazers_count":0,"watchers_count":0,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":5,"mirror_url":null,"archived":false,"open_issues_count":24,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":5,"open_issues":24,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182"},"html":{"href":"https://github.com/CS2103-AY1819S1-W10-1/main/pull/182"},"issue":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/182"},"comments":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/issues/182/comments"},"review_comments":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182/comments"},"review_comment":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/pulls/182/commits"},"statuses":{"href":"https://api.github.com/repos/CS2103-AY1819S1-W10-1/main/statuses/1d2b818a7f16464c419fc4e80427f9ff312e75c6"}},"author_association":"NONE"}}
{"actor":{"display_login":"xueyantian"}}