{"action":"created","comment":{"url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/comments/58774301","id":58774301,"diff_hunk":"@@ -342,6 +426,14 @@ angular.module('pvta.services', ['ngResource'])\n \n   return {\n     placeDesiredMarker: placeDesiredMarker,\n+<<<<<<< HEAD","path":"www/js/services.js","position":null,"original_position":303,"commit_id":"8aae28daedb5332c7072e06ad0b84ed75cb0b863","original_commit_id":"d5eb2231a49ad728f580b7221aa0e86b26349304","user":{"login":"akaplo","id":7144148,"avatar_url":"https://avatars.githubusercontent.com/u/7144148?v=3","gravatar_id":"","url":"https://api.github.com/users/akaplo","html_url":"https://github.com/akaplo","followers_url":"https://api.github.com/users/akaplo/followers","following_url":"https://api.github.com/users/akaplo/following{/other_user}","gists_url":"https://api.github.com/users/akaplo/gists{/gist_id}","starred_url":"https://api.github.com/users/akaplo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/akaplo/subscriptions","organizations_url":"https://api.github.com/users/akaplo/orgs","repos_url":"https://api.github.com/users/akaplo/repos","events_url":"https://api.github.com/users/akaplo/events{/privacy}","received_events_url":"https://api.github.com/users/akaplo/received_events","type":"User","site_admin":false},"body":"Another merge conflict","created_at":"2016-04-06T20:18:22Z","updated_at":"2016-04-06T20:18:22Z","html_url":"https://github.com/umts/pvta-multiplatform/pull/110#discussion_r58774301","pull_request_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110","_links":{"self":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/comments/58774301"},"html":{"href":"https://github.com/umts/pvta-multiplatform/pull/110#discussion_r58774301"},"pull_request":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110"}}},"pull_request":{"url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110","id":64698368,"html_url":"https://github.com/umts/pvta-multiplatform/pull/110","diff_url":"https://github.com/umts/pvta-multiplatform/pull/110.diff","patch_url":"https://github.com/umts/pvta-multiplatform/pull/110.patch","issue_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/110","number":110,"state":"open","locked":false,"title":"Plan trip","user":{"login":"petermarathas","id":6088239,"avatar_url":"https://avatars.githubusercontent.com/u/6088239?v=3","gravatar_id":"","url":"https://api.github.com/users/petermarathas","html_url":"https://github.com/petermarathas","followers_url":"https://api.github.com/users/petermarathas/followers","following_url":"https://api.github.com/users/petermarathas/following{/other_user}","gists_url":"https://api.github.com/users/petermarathas/gists{/gist_id}","starred_url":"https://api.github.com/users/petermarathas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/petermarathas/subscriptions","organizations_url":"https://api.github.com/users/petermarathas/orgs","repos_url":"https://api.github.com/users/petermarathas/repos","events_url":"https://api.github.com/users/petermarathas/events{/privacy}","received_events_url":"https://api.github.com/users/petermarathas/received_events","type":"User","site_admin":false},"body":"Check it over lemme know, haven't tested on Android but it works fine on iOS.\r\n\r\n:bowtie: ","created_at":"2016-03-30T21:14:53Z","updated_at":"2016-04-06T20:18:22Z","closed_at":null,"merged_at":null,"merge_commit_sha":"106d7abd34b74cf965d40fac3306a978f1615e3c","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110/commits","review_comments_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110/comments","review_comment_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/comments{/number}","comments_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/110/comments","statuses_url":"https://api.github.com/repos/umts/pvta-multiplatform/statuses/8aae28daedb5332c7072e06ad0b84ed75cb0b863","head":{"label":"umts:plan-trip","ref":"plan-trip","sha":"8aae28daedb5332c7072e06ad0b84ed75cb0b863","user":{"login":"umts","id":398175,"avatar_url":"https://avatars.githubusercontent.com/u/398175?v=3","gravatar_id":"","url":"https://api.github.com/users/umts","html_url":"https://github.com/umts","followers_url":"https://api.github.com/users/umts/followers","following_url":"https://api.github.com/users/umts/following{/other_user}","gists_url":"https://api.github.com/users/umts/gists{/gist_id}","starred_url":"https://api.github.com/users/umts/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/umts/subscriptions","organizations_url":"https://api.github.com/users/umts/orgs","repos_url":"https://api.github.com/users/umts/repos","events_url":"https://api.github.com/users/umts/events{/privacy}","received_events_url":"https://api.github.com/users/umts/received_events","type":"Organization","site_admin":false},"repo":{"id":49676297,"name":"pvta-multiplatform","full_name":"umts/pvta-multiplatform","owner":{"login":"umts","id":398175,"avatar_url":"https://avatars.githubusercontent.com/u/398175?v=3","gravatar_id":"","url":"https://api.github.com/users/umts","html_url":"https://github.com/umts","followers_url":"https://api.github.com/users/umts/followers","following_url":"https://api.github.com/users/umts/following{/other_user}","gists_url":"https://api.github.com/users/umts/gists{/gist_id}","starred_url":"https://api.github.com/users/umts/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/umts/subscriptions","organizations_url":"https://api.github.com/users/umts/orgs","repos_url":"https://api.github.com/users/umts/repos","events_url":"https://api.github.com/users/umts/events{/privacy}","received_events_url":"https://api.github.com/users/umts/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/umts/pvta-multiplatform","description":"Transit realtime app for mobile devices","fork":true,"url":"https://api.github.com/repos/umts/pvta-multiplatform","forks_url":"https://api.github.com/repos/umts/pvta-multiplatform/forks","keys_url":"https://api.github.com/repos/umts/pvta-multiplatform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/umts/pvta-multiplatform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/umts/pvta-multiplatform/teams","hooks_url":"https://api.github.com/repos/umts/pvta-multiplatform/hooks","issue_events_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/events{/number}","events_url":"https://api.github.com/repos/umts/pvta-multiplatform/events","assignees_url":"https://api.github.com/repos/umts/pvta-multiplatform/assignees{/user}","branches_url":"https://api.github.com/repos/umts/pvta-multiplatform/branches{/branch}","tags_url":"https://api.github.com/repos/umts/pvta-multiplatform/tags","blobs_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/refs{/sha}","trees_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/umts/pvta-multiplatform/statuses/{sha}","languages_url":"https://api.github.com/repos/umts/pvta-multiplatform/languages","stargazers_url":"https://api.github.com/repos/umts/pvta-multiplatform/stargazers","contributors_url":"https://api.github.com/repos/umts/pvta-multiplatform/contributors","subscribers_url":"https://api.github.com/repos/umts/pvta-multiplatform/subscribers","subscription_url":"https://api.github.com/repos/umts/pvta-multiplatform/subscription","commits_url":"https://api.github.com/repos/umts/pvta-multiplatform/commits{/sha}","git_commits_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/commits{/sha}","comments_url":"https://api.github.com/repos/umts/pvta-multiplatform/comments{/number}","issue_comment_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/comments{/number}","contents_url":"https://api.github.com/repos/umts/pvta-multiplatform/contents/{+path}","compare_url":"https://api.github.com/repos/umts/pvta-multiplatform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/umts/pvta-multiplatform/merges","archive_url":"https://api.github.com/repos/umts/pvta-multiplatform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/umts/pvta-multiplatform/downloads","issues_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues{/number}","pulls_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls{/number}","milestones_url":"https://api.github.com/repos/umts/pvta-multiplatform/milestones{/number}","notifications_url":"https://api.github.com/repos/umts/pvta-multiplatform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/umts/pvta-multiplatform/labels{/name}","releases_url":"https://api.github.com/repos/umts/pvta-multiplatform/releases{/id}","deployments_url":"https://api.github.com/repos/umts/pvta-multiplatform/deployments","created_at":"2016-01-14T21:28:36Z","updated_at":"2016-03-04T19:46:14Z","pushed_at":"2016-04-06T20:17:39Z","git_url":"git://github.com/umts/pvta-multiplatform.git","ssh_url":"git@github.com:umts/pvta-multiplatform.git","clone_url":"https://github.com/umts/pvta-multiplatform.git","svn_url":"https://github.com/umts/pvta-multiplatform","homepage":"","size":42544,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":18,"forks":3,"open_issues":18,"watchers":0,"default_branch":"master"}},"base":{"label":"umts:master","ref":"master","sha":"9234aae5f00164d272b96bdfb77e93c9db4e881e","user":{"login":"umts","id":398175,"avatar_url":"https://avatars.githubusercontent.com/u/398175?v=3","gravatar_id":"","url":"https://api.github.com/users/umts","html_url":"https://github.com/umts","followers_url":"https://api.github.com/users/umts/followers","following_url":"https://api.github.com/users/umts/following{/other_user}","gists_url":"https://api.github.com/users/umts/gists{/gist_id}","starred_url":"https://api.github.com/users/umts/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/umts/subscriptions","organizations_url":"https://api.github.com/users/umts/orgs","repos_url":"https://api.github.com/users/umts/repos","events_url":"https://api.github.com/users/umts/events{/privacy}","received_events_url":"https://api.github.com/users/umts/received_events","type":"Organization","site_admin":false},"repo":{"id":49676297,"name":"pvta-multiplatform","full_name":"umts/pvta-multiplatform","owner":{"login":"umts","id":398175,"avatar_url":"https://avatars.githubusercontent.com/u/398175?v=3","gravatar_id":"","url":"https://api.github.com/users/umts","html_url":"https://github.com/umts","followers_url":"https://api.github.com/users/umts/followers","following_url":"https://api.github.com/users/umts/following{/other_user}","gists_url":"https://api.github.com/users/umts/gists{/gist_id}","starred_url":"https://api.github.com/users/umts/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/umts/subscriptions","organizations_url":"https://api.github.com/users/umts/orgs","repos_url":"https://api.github.com/users/umts/repos","events_url":"https://api.github.com/users/umts/events{/privacy}","received_events_url":"https://api.github.com/users/umts/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/umts/pvta-multiplatform","description":"Transit realtime app for mobile devices","fork":true,"url":"https://api.github.com/repos/umts/pvta-multiplatform","forks_url":"https://api.github.com/repos/umts/pvta-multiplatform/forks","keys_url":"https://api.github.com/repos/umts/pvta-multiplatform/keys{/key_id}","collaborators_url":"https://api.github.com/repos/umts/pvta-multiplatform/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/umts/pvta-multiplatform/teams","hooks_url":"https://api.github.com/repos/umts/pvta-multiplatform/hooks","issue_events_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/events{/number}","events_url":"https://api.github.com/repos/umts/pvta-multiplatform/events","assignees_url":"https://api.github.com/repos/umts/pvta-multiplatform/assignees{/user}","branches_url":"https://api.github.com/repos/umts/pvta-multiplatform/branches{/branch}","tags_url":"https://api.github.com/repos/umts/pvta-multiplatform/tags","blobs_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/refs{/sha}","trees_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/trees{/sha}","statuses_url":"https://api.github.com/repos/umts/pvta-multiplatform/statuses/{sha}","languages_url":"https://api.github.com/repos/umts/pvta-multiplatform/languages","stargazers_url":"https://api.github.com/repos/umts/pvta-multiplatform/stargazers","contributors_url":"https://api.github.com/repos/umts/pvta-multiplatform/contributors","subscribers_url":"https://api.github.com/repos/umts/pvta-multiplatform/subscribers","subscription_url":"https://api.github.com/repos/umts/pvta-multiplatform/subscription","commits_url":"https://api.github.com/repos/umts/pvta-multiplatform/commits{/sha}","git_commits_url":"https://api.github.com/repos/umts/pvta-multiplatform/git/commits{/sha}","comments_url":"https://api.github.com/repos/umts/pvta-multiplatform/comments{/number}","issue_comment_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues/comments{/number}","contents_url":"https://api.github.com/repos/umts/pvta-multiplatform/contents/{+path}","compare_url":"https://api.github.com/repos/umts/pvta-multiplatform/compare/{base}...{head}","merges_url":"https://api.github.com/repos/umts/pvta-multiplatform/merges","archive_url":"https://api.github.com/repos/umts/pvta-multiplatform/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/umts/pvta-multiplatform/downloads","issues_url":"https://api.github.com/repos/umts/pvta-multiplatform/issues{/number}","pulls_url":"https://api.github.com/repos/umts/pvta-multiplatform/pulls{/number}","milestones_url":"https://api.github.com/repos/umts/pvta-multiplatform/milestones{/number}","notifications_url":"https://api.github.com/repos/umts/pvta-multiplatform/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/umts/pvta-multiplatform/labels{/name}","releases_url":"https://api.github.com/repos/umts/pvta-multiplatform/releases{/id}","deployments_url":"https://api.github.com/repos/umts/pvta-multiplatform/deployments","created_at":"2016-01-14T21:28:36Z","updated_at":"2016-03-04T19:46:14Z","pushed_at":"2016-04-06T20:17:39Z","git_url":"git://github.com/umts/pvta-multiplatform.git","ssh_url":"git@github.com:umts/pvta-multiplatform.git","clone_url":"https://github.com/umts/pvta-multiplatform.git","svn_url":"https://github.com/umts/pvta-multiplatform","homepage":"","size":42544,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":18,"forks":3,"open_issues":18,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110"},"html":{"href":"https://github.com/umts/pvta-multiplatform/pull/110"},"issue":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/issues/110"},"comments":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/issues/110/comments"},"review_comments":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110/comments"},"review_comment":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/pulls/110/commits"},"statuses":{"href":"https://api.github.com/repos/umts/pvta-multiplatform/statuses/8aae28daedb5332c7072e06ad0b84ed75cb0b863"}}}}