{"action":"created","comment":{"url":"https://api.github.com/repos/bmt/photobooth/pulls/comments/41748490","id":41748490,"diff_hunk":"@@ -1,3 +1,11 @@\n <section data-ng-controller=\"PhotosController\" data-ng-init=\"findOne()\">\n+<<<<<<< HEAD","path":"frontend/public/modules/photos/views/view-photo.client.view.html","position":2,"original_position":2,"commit_id":"bdfd532706c2ef6b08d28aa2624d6fc94b86a51b","original_commit_id":"bdfd532706c2ef6b08d28aa2624d6fc94b86a51b","user":{"login":"bmt","id":84353,"avatar_url":"https://avatars.githubusercontent.com/u/84353?v=3","gravatar_id":"","url":"https://api.github.com/users/bmt","html_url":"https://github.com/bmt","followers_url":"https://api.github.com/users/bmt/followers","following_url":"https://api.github.com/users/bmt/following{/other_user}","gists_url":"https://api.github.com/users/bmt/gists{/gist_id}","starred_url":"https://api.github.com/users/bmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmt/subscriptions","organizations_url":"https://api.github.com/users/bmt/orgs","repos_url":"https://api.github.com/users/bmt/repos","events_url":"https://api.github.com/users/bmt/events{/privacy}","received_events_url":"https://api.github.com/users/bmt/received_events","type":"User","site_admin":false},"body":"You have a merge conflict that needs to be fixed here.","created_at":"2015-10-12T11:50:06Z","updated_at":"2015-10-12T11:50:06Z","html_url":"https://github.com/bmt/photobooth/pull/2#discussion_r41748490","pull_request_url":"https://api.github.com/repos/bmt/photobooth/pulls/2","_links":{"self":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/comments/41748490"},"html":{"href":"https://github.com/bmt/photobooth/pull/2#discussion_r41748490"},"pull_request":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/2"}}},"pull_request":{"url":"https://api.github.com/repos/bmt/photobooth/pulls/2","id":47384995,"html_url":"https://github.com/bmt/photobooth/pull/2","diff_url":"https://github.com/bmt/photobooth/pull/2.diff","patch_url":"https://github.com/bmt/photobooth/pull/2.patch","issue_url":"https://api.github.com/repos/bmt/photobooth/issues/2","number":2,"state":"open","locked":false,"title":"facebook sharing","user":{"login":"jtrudell","id":11252761,"avatar_url":"https://avatars.githubusercontent.com/u/11252761?v=3","gravatar_id":"","url":"https://api.github.com/users/jtrudell","html_url":"https://github.com/jtrudell","followers_url":"https://api.github.com/users/jtrudell/followers","following_url":"https://api.github.com/users/jtrudell/following{/other_user}","gists_url":"https://api.github.com/users/jtrudell/gists{/gist_id}","starred_url":"https://api.github.com/users/jtrudell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jtrudell/subscriptions","organizations_url":"https://api.github.com/users/jtrudell/orgs","repos_url":"https://api.github.com/users/jtrudell/repos","events_url":"https://api.github.com/users/jtrudell/events{/privacy}","received_events_url":"https://api.github.com/users/jtrudell/received_events","type":"User","site_admin":false},"body":"First, it took me an insane amount of time to add share and like buttons, but it was a great learning experience. Second, one day I will have to sit down with you and just go through the whole MEAN stack, because I have read 80 tutorials at this point and I still don't know how to get the photos views into the server layout view.","created_at":"2015-10-12T04:26:41Z","updated_at":"2015-10-12T11:50:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a74c08124cd5ae6b824e4460cc38d6be1d0f8df9","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/bmt/photobooth/pulls/2/commits","review_comments_url":"https://api.github.com/repos/bmt/photobooth/pulls/2/comments","review_comment_url":"https://api.github.com/repos/bmt/photobooth/pulls/comments{/number}","comments_url":"https://api.github.com/repos/bmt/photobooth/issues/2/comments","statuses_url":"https://api.github.com/repos/bmt/photobooth/statuses/bdfd532706c2ef6b08d28aa2624d6fc94b86a51b","head":{"label":"jtrudell:master","ref":"master","sha":"bdfd532706c2ef6b08d28aa2624d6fc94b86a51b","user":{"login":"jtrudell","id":11252761,"avatar_url":"https://avatars.githubusercontent.com/u/11252761?v=3","gravatar_id":"","url":"https://api.github.com/users/jtrudell","html_url":"https://github.com/jtrudell","followers_url":"https://api.github.com/users/jtrudell/followers","following_url":"https://api.github.com/users/jtrudell/following{/other_user}","gists_url":"https://api.github.com/users/jtrudell/gists{/gist_id}","starred_url":"https://api.github.com/users/jtrudell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jtrudell/subscriptions","organizations_url":"https://api.github.com/users/jtrudell/orgs","repos_url":"https://api.github.com/users/jtrudell/repos","events_url":"https://api.github.com/users/jtrudell/events{/privacy}","received_events_url":"https://api.github.com/users/jtrudell/received_events","type":"User","site_admin":false},"repo":{"id":43382984,"name":"photobooth","full_name":"jtrudell/photobooth","owner":{"login":"jtrudell","id":11252761,"avatar_url":"https://avatars.githubusercontent.com/u/11252761?v=3","gravatar_id":"","url":"https://api.github.com/users/jtrudell","html_url":"https://github.com/jtrudell","followers_url":"https://api.github.com/users/jtrudell/followers","following_url":"https://api.github.com/users/jtrudell/following{/other_user}","gists_url":"https://api.github.com/users/jtrudell/gists{/gist_id}","starred_url":"https://api.github.com/users/jtrudell/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jtrudell/subscriptions","organizations_url":"https://api.github.com/users/jtrudell/orgs","repos_url":"https://api.github.com/users/jtrudell/repos","events_url":"https://api.github.com/users/jtrudell/events{/privacy}","received_events_url":"https://api.github.com/users/jtrudell/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jtrudell/photobooth","description":"","fork":true,"url":"https://api.github.com/repos/jtrudell/photobooth","forks_url":"https://api.github.com/repos/jtrudell/photobooth/forks","keys_url":"https://api.github.com/repos/jtrudell/photobooth/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jtrudell/photobooth/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jtrudell/photobooth/teams","hooks_url":"https://api.github.com/repos/jtrudell/photobooth/hooks","issue_events_url":"https://api.github.com/repos/jtrudell/photobooth/issues/events{/number}","events_url":"https://api.github.com/repos/jtrudell/photobooth/events","assignees_url":"https://api.github.com/repos/jtrudell/photobooth/assignees{/user}","branches_url":"https://api.github.com/repos/jtrudell/photobooth/branches{/branch}","tags_url":"https://api.github.com/repos/jtrudell/photobooth/tags","blobs_url":"https://api.github.com/repos/jtrudell/photobooth/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jtrudell/photobooth/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jtrudell/photobooth/git/refs{/sha}","trees_url":"https://api.github.com/repos/jtrudell/photobooth/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jtrudell/photobooth/statuses/{sha}","languages_url":"https://api.github.com/repos/jtrudell/photobooth/languages","stargazers_url":"https://api.github.com/repos/jtrudell/photobooth/stargazers","contributors_url":"https://api.github.com/repos/jtrudell/photobooth/contributors","subscribers_url":"https://api.github.com/repos/jtrudell/photobooth/subscribers","subscription_url":"https://api.github.com/repos/jtrudell/photobooth/subscription","commits_url":"https://api.github.com/repos/jtrudell/photobooth/commits{/sha}","git_commits_url":"https://api.github.com/repos/jtrudell/photobooth/git/commits{/sha}","comments_url":"https://api.github.com/repos/jtrudell/photobooth/comments{/number}","issue_comment_url":"https://api.github.com/repos/jtrudell/photobooth/issues/comments{/number}","contents_url":"https://api.github.com/repos/jtrudell/photobooth/contents/{+path}","compare_url":"https://api.github.com/repos/jtrudell/photobooth/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jtrudell/photobooth/merges","archive_url":"https://api.github.com/repos/jtrudell/photobooth/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jtrudell/photobooth/downloads","issues_url":"https://api.github.com/repos/jtrudell/photobooth/issues{/number}","pulls_url":"https://api.github.com/repos/jtrudell/photobooth/pulls{/number}","milestones_url":"https://api.github.com/repos/jtrudell/photobooth/milestones{/number}","notifications_url":"https://api.github.com/repos/jtrudell/photobooth/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jtrudell/photobooth/labels{/name}","releases_url":"https://api.github.com/repos/jtrudell/photobooth/releases{/id}","created_at":"2015-09-29T17:28:44Z","updated_at":"2015-09-29T17:28:46Z","pushed_at":"2015-10-12T04:35:03Z","git_url":"git://github.com/jtrudell/photobooth.git","ssh_url":"git@github.com:jtrudell/photobooth.git","clone_url":"https://github.com/jtrudell/photobooth.git","svn_url":"https://github.com/jtrudell/photobooth","homepage":null,"size":69424,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","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":"bmt:master","ref":"master","sha":"c5a0b27c180b4df8dff80fe0e4591d56249906df","user":{"login":"bmt","id":84353,"avatar_url":"https://avatars.githubusercontent.com/u/84353?v=3","gravatar_id":"","url":"https://api.github.com/users/bmt","html_url":"https://github.com/bmt","followers_url":"https://api.github.com/users/bmt/followers","following_url":"https://api.github.com/users/bmt/following{/other_user}","gists_url":"https://api.github.com/users/bmt/gists{/gist_id}","starred_url":"https://api.github.com/users/bmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmt/subscriptions","organizations_url":"https://api.github.com/users/bmt/orgs","repos_url":"https://api.github.com/users/bmt/repos","events_url":"https://api.github.com/users/bmt/events{/privacy}","received_events_url":"https://api.github.com/users/bmt/received_events","type":"User","site_admin":false},"repo":{"id":42485429,"name":"photobooth","full_name":"bmt/photobooth","owner":{"login":"bmt","id":84353,"avatar_url":"https://avatars.githubusercontent.com/u/84353?v=3","gravatar_id":"","url":"https://api.github.com/users/bmt","html_url":"https://github.com/bmt","followers_url":"https://api.github.com/users/bmt/followers","following_url":"https://api.github.com/users/bmt/following{/other_user}","gists_url":"https://api.github.com/users/bmt/gists{/gist_id}","starred_url":"https://api.github.com/users/bmt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmt/subscriptions","organizations_url":"https://api.github.com/users/bmt/orgs","repos_url":"https://api.github.com/users/bmt/repos","events_url":"https://api.github.com/users/bmt/events{/privacy}","received_events_url":"https://api.github.com/users/bmt/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/bmt/photobooth","description":"","fork":false,"url":"https://api.github.com/repos/bmt/photobooth","forks_url":"https://api.github.com/repos/bmt/photobooth/forks","keys_url":"https://api.github.com/repos/bmt/photobooth/keys{/key_id}","collaborators_url":"https://api.github.com/repos/bmt/photobooth/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/bmt/photobooth/teams","hooks_url":"https://api.github.com/repos/bmt/photobooth/hooks","issue_events_url":"https://api.github.com/repos/bmt/photobooth/issues/events{/number}","events_url":"https://api.github.com/repos/bmt/photobooth/events","assignees_url":"https://api.github.com/repos/bmt/photobooth/assignees{/user}","branches_url":"https://api.github.com/repos/bmt/photobooth/branches{/branch}","tags_url":"https://api.github.com/repos/bmt/photobooth/tags","blobs_url":"https://api.github.com/repos/bmt/photobooth/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/bmt/photobooth/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/bmt/photobooth/git/refs{/sha}","trees_url":"https://api.github.com/repos/bmt/photobooth/git/trees{/sha}","statuses_url":"https://api.github.com/repos/bmt/photobooth/statuses/{sha}","languages_url":"https://api.github.com/repos/bmt/photobooth/languages","stargazers_url":"https://api.github.com/repos/bmt/photobooth/stargazers","contributors_url":"https://api.github.com/repos/bmt/photobooth/contributors","subscribers_url":"https://api.github.com/repos/bmt/photobooth/subscribers","subscription_url":"https://api.github.com/repos/bmt/photobooth/subscription","commits_url":"https://api.github.com/repos/bmt/photobooth/commits{/sha}","git_commits_url":"https://api.github.com/repos/bmt/photobooth/git/commits{/sha}","comments_url":"https://api.github.com/repos/bmt/photobooth/comments{/number}","issue_comment_url":"https://api.github.com/repos/bmt/photobooth/issues/comments{/number}","contents_url":"https://api.github.com/repos/bmt/photobooth/contents/{+path}","compare_url":"https://api.github.com/repos/bmt/photobooth/compare/{base}...{head}","merges_url":"https://api.github.com/repos/bmt/photobooth/merges","archive_url":"https://api.github.com/repos/bmt/photobooth/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/bmt/photobooth/downloads","issues_url":"https://api.github.com/repos/bmt/photobooth/issues{/number}","pulls_url":"https://api.github.com/repos/bmt/photobooth/pulls{/number}","milestones_url":"https://api.github.com/repos/bmt/photobooth/milestones{/number}","notifications_url":"https://api.github.com/repos/bmt/photobooth/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/bmt/photobooth/labels{/name}","releases_url":"https://api.github.com/repos/bmt/photobooth/releases{/id}","created_at":"2015-09-15T00:40:57Z","updated_at":"2015-10-04T16:40:17Z","pushed_at":"2015-10-12T04:35:03Z","git_url":"git://github.com/bmt/photobooth.git","ssh_url":"git@github.com:bmt/photobooth.git","clone_url":"https://github.com/bmt/photobooth.git","svn_url":"https://github.com/bmt/photobooth","homepage":null,"size":69510,"stargazers_count":1,"watchers_count":1,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/2"},"html":{"href":"https://github.com/bmt/photobooth/pull/2"},"issue":{"href":"https://api.github.com/repos/bmt/photobooth/issues/2"},"comments":{"href":"https://api.github.com/repos/bmt/photobooth/issues/2/comments"},"review_comments":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/2/comments"},"review_comment":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/bmt/photobooth/pulls/2/commits"},"statuses":{"href":"https://api.github.com/repos/bmt/photobooth/statuses/bdfd532706c2ef6b08d28aa2624d6fc94b86a51b"}}}}