GitHub PullRequestReviewCommentEvent at 2014-05-26 01:36:42
Repository: CS-537-CSM
Actor: rcliao
Payload: {"comment":{"url":"https://api.github.com/repos/rcliao/CS-537-CSM/pulls/comments/13034161","id":13034161,"diff_hunk":"@@ -41,3 +263,62 @@ insert into users (username,password,first_name,last_name,email,cin)\n insert into users (username,password,first_name,last_name,email,cin) \n        values ('ssaeedi','student123','Saman','Saeedi','ssaeedi@calstatela.edu',555666777);\n \n+<<<<<<< HEAD","path":"src/scripts/create-csm.sql","position":244,"original_position":244,"commit_id":"f49cda44b782e19898350b8dd121694eb61aa202","original_commit_id":"f49cda44b782e19898350b8dd121694eb61aa202","user":{"login":"rcliao","id":2566047,"avatar_url":"https://avatars.githubusercontent.com/u/2566047?","gravatar_id":"97cb4fb5ea23efdd214804f7816eb247","url":"https://api.github.com/users/rcliao","html_url":"https://github.com/rcliao","followers_url":"https://api.github.com/users/rcliao/followers","following_url":"https://api.github.com/users/rcliao/following{/other_user}","gists_url":"https://api.github.com/users/rcliao/gists{/gist_id}","starred_url":"https://api.github.com/users/rcliao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rcliao/subscriptions","organizations_url":"https://api.github.com/users/rcliao/orgs","repos_url":"https://api.github.com/users/rcliao/repos","events_url":"https://api.github.com/users/rcliao/events{/privacy}","received_events_url":"https://api.github.com/users/rcliao/received_events","type":"User","site_admin":false},"body":"there is some merge conflict that is not resolved clean yet, please resolve this file.\r\n\r\n:warning: ","created_at":"2014-05-26T01:36:42Z","updated_at":"2014-05-26T01:36:42Z","html_url":"https://github.com/rcliao/CS-537-CSM/pull/3#discussion_r13034161","pull_request_url":"https://api.github.com/repos/rcliao/CS-537-CSM/pulls/3","_links":{"self":{"href":"https://api.github.com/repos/rcliao/CS-537-CSM/pulls/comments/13034161"},"html":{"href":"https://github.com/rcliao/CS-537-CSM/pull/3#discussion_r13034161"},"pull_request":{"href":"https://api.github.com/repos/rcliao/CS-537-CSM/pulls/3"}}}}