{"action":"opened","number":308,"pull_request":{"url":"https://api.github.com/repos/fuel/fuel/pulls/308","id":35939517,"html_url":"https://github.com/fuel/fuel/pull/308","diff_url":"https://github.com/fuel/fuel/pull/308.diff","patch_url":"https://github.com/fuel/fuel/pull/308.patch","issue_url":"https://api.github.com/repos/fuel/fuel/issues/308","number":308,"state":"open","locked":false,"title":"Remove git conflict notes","user":{"login":"Art4","id":2162994,"avatar_url":"https://avatars.githubusercontent.com/u/2162994?v=3","gravatar_id":"","url":"https://api.github.com/users/Art4","html_url":"https://github.com/Art4","followers_url":"https://api.github.com/users/Art4/followers","following_url":"https://api.github.com/users/Art4/following{/other_user}","gists_url":"https://api.github.com/users/Art4/gists{/gist_id}","starred_url":"https://api.github.com/users/Art4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Art4/subscriptions","organizations_url":"https://api.github.com/users/Art4/orgs","repos_url":"https://api.github.com/users/Art4/repos","events_url":"https://api.github.com/users/Art4/events{/privacy}","received_events_url":"https://api.github.com/users/Art4/received_events","type":"User","site_admin":false},"body":"Ups :smile: I've found this in the ZIP file.","created_at":"2015-05-21T14:31:59Z","updated_at":"2015-05-21T14:31:59Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/fuel/fuel/pulls/308/commits","review_comments_url":"https://api.github.com/repos/fuel/fuel/pulls/308/comments","review_comment_url":"https://api.github.com/repos/fuel/fuel/pulls/comments{/number}","comments_url":"https://api.github.com/repos/fuel/fuel/issues/308/comments","statuses_url":"https://api.github.com/repos/fuel/fuel/statuses/74d97cc5c689d2211a3a2a16f873c01e3900850b","head":{"label":"Art4:patch-1","ref":"patch-1","sha":"74d97cc5c689d2211a3a2a16f873c01e3900850b","user":{"login":"Art4","id":2162994,"avatar_url":"https://avatars.githubusercontent.com/u/2162994?v=3","gravatar_id":"","url":"https://api.github.com/users/Art4","html_url":"https://github.com/Art4","followers_url":"https://api.github.com/users/Art4/followers","following_url":"https://api.github.com/users/Art4/following{/other_user}","gists_url":"https://api.github.com/users/Art4/gists{/gist_id}","starred_url":"https://api.github.com/users/Art4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Art4/subscriptions","organizations_url":"https://api.github.com/users/Art4/orgs","repos_url":"https://api.github.com/users/Art4/repos","events_url":"https://api.github.com/users/Art4/events{/privacy}","received_events_url":"https://api.github.com/users/Art4/received_events","type":"User","site_admin":false},"repo":{"id":36017469,"name":"fuel","full_name":"Art4/fuel","owner":{"login":"Art4","id":2162994,"avatar_url":"https://avatars.githubusercontent.com/u/2162994?v=3","gravatar_id":"","url":"https://api.github.com/users/Art4","html_url":"https://github.com/Art4","followers_url":"https://api.github.com/users/Art4/followers","following_url":"https://api.github.com/users/Art4/following{/other_user}","gists_url":"https://api.github.com/users/Art4/gists{/gist_id}","starred_url":"https://api.github.com/users/Art4/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Art4/subscriptions","organizations_url":"https://api.github.com/users/Art4/orgs","repos_url":"https://api.github.com/users/Art4/repos","events_url":"https://api.github.com/users/Art4/events{/privacy}","received_events_url":"https://api.github.com/users/Art4/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Art4/fuel","description":"FuelPHP is a simple, flexible, community driven PHP 5.3+ framework, based on the best ideas of other frameworks, with a fresh start!","fork":true,"url":"https://api.github.com/repos/Art4/fuel","forks_url":"https://api.github.com/repos/Art4/fuel/forks","keys_url":"https://api.github.com/repos/Art4/fuel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Art4/fuel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Art4/fuel/teams","hooks_url":"https://api.github.com/repos/Art4/fuel/hooks","issue_events_url":"https://api.github.com/repos/Art4/fuel/issues/events{/number}","events_url":"https://api.github.com/repos/Art4/fuel/events","assignees_url":"https://api.github.com/repos/Art4/fuel/assignees{/user}","branches_url":"https://api.github.com/repos/Art4/fuel/branches{/branch}","tags_url":"https://api.github.com/repos/Art4/fuel/tags","blobs_url":"https://api.github.com/repos/Art4/fuel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Art4/fuel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Art4/fuel/git/refs{/sha}","trees_url":"https://api.github.com/repos/Art4/fuel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Art4/fuel/statuses/{sha}","languages_url":"https://api.github.com/repos/Art4/fuel/languages","stargazers_url":"https://api.github.com/repos/Art4/fuel/stargazers","contributors_url":"https://api.github.com/repos/Art4/fuel/contributors","subscribers_url":"https://api.github.com/repos/Art4/fuel/subscribers","subscription_url":"https://api.github.com/repos/Art4/fuel/subscription","commits_url":"https://api.github.com/repos/Art4/fuel/commits{/sha}","git_commits_url":"https://api.github.com/repos/Art4/fuel/git/commits{/sha}","comments_url":"https://api.github.com/repos/Art4/fuel/comments{/number}","issue_comment_url":"https://api.github.com/repos/Art4/fuel/issues/comments{/number}","contents_url":"https://api.github.com/repos/Art4/fuel/contents/{+path}","compare_url":"https://api.github.com/repos/Art4/fuel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Art4/fuel/merges","archive_url":"https://api.github.com/repos/Art4/fuel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Art4/fuel/downloads","issues_url":"https://api.github.com/repos/Art4/fuel/issues{/number}","pulls_url":"https://api.github.com/repos/Art4/fuel/pulls{/number}","milestones_url":"https://api.github.com/repos/Art4/fuel/milestones{/number}","notifications_url":"https://api.github.com/repos/Art4/fuel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Art4/fuel/labels{/name}","releases_url":"https://api.github.com/repos/Art4/fuel/releases{/id}","created_at":"2015-05-21T14:29:06Z","updated_at":"2015-05-21T14:29:06Z","pushed_at":"2015-05-21T14:29:55Z","git_url":"git://github.com/Art4/fuel.git","ssh_url":"git@github.com:Art4/fuel.git","clone_url":"https://github.com/Art4/fuel.git","svn_url":"https://github.com/Art4/fuel","homepage":"http://fuelphp.com","size":8124,"stargazers_count":0,"watchers_count":0,"language":"PHP","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":"1.7/master"}},"base":{"label":"fuel:1.7/master","ref":"1.7/master","sha":"4bf6e76beb2bc12316ef282c1dcc952ef0601d7a","user":{"login":"fuel","id":452101,"avatar_url":"https://avatars.githubusercontent.com/u/452101?v=3","gravatar_id":"","url":"https://api.github.com/users/fuel","html_url":"https://github.com/fuel","followers_url":"https://api.github.com/users/fuel/followers","following_url":"https://api.github.com/users/fuel/following{/other_user}","gists_url":"https://api.github.com/users/fuel/gists{/gist_id}","starred_url":"https://api.github.com/users/fuel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fuel/subscriptions","organizations_url":"https://api.github.com/users/fuel/orgs","repos_url":"https://api.github.com/users/fuel/repos","events_url":"https://api.github.com/users/fuel/events{/privacy}","received_events_url":"https://api.github.com/users/fuel/received_events","type":"Organization","site_admin":false},"repo":{"id":1020260,"name":"fuel","full_name":"fuel/fuel","owner":{"login":"fuel","id":452101,"avatar_url":"https://avatars.githubusercontent.com/u/452101?v=3","gravatar_id":"","url":"https://api.github.com/users/fuel","html_url":"https://github.com/fuel","followers_url":"https://api.github.com/users/fuel/followers","following_url":"https://api.github.com/users/fuel/following{/other_user}","gists_url":"https://api.github.com/users/fuel/gists{/gist_id}","starred_url":"https://api.github.com/users/fuel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/fuel/subscriptions","organizations_url":"https://api.github.com/users/fuel/orgs","repos_url":"https://api.github.com/users/fuel/repos","events_url":"https://api.github.com/users/fuel/events{/privacy}","received_events_url":"https://api.github.com/users/fuel/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/fuel/fuel","description":"FuelPHP is a simple, flexible, community driven PHP 5.3+ framework, based on the best ideas of other frameworks, with a fresh start!","fork":false,"url":"https://api.github.com/repos/fuel/fuel","forks_url":"https://api.github.com/repos/fuel/fuel/forks","keys_url":"https://api.github.com/repos/fuel/fuel/keys{/key_id}","collaborators_url":"https://api.github.com/repos/fuel/fuel/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/fuel/fuel/teams","hooks_url":"https://api.github.com/repos/fuel/fuel/hooks","issue_events_url":"https://api.github.com/repos/fuel/fuel/issues/events{/number}","events_url":"https://api.github.com/repos/fuel/fuel/events","assignees_url":"https://api.github.com/repos/fuel/fuel/assignees{/user}","branches_url":"https://api.github.com/repos/fuel/fuel/branches{/branch}","tags_url":"https://api.github.com/repos/fuel/fuel/tags","blobs_url":"https://api.github.com/repos/fuel/fuel/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/fuel/fuel/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/fuel/fuel/git/refs{/sha}","trees_url":"https://api.github.com/repos/fuel/fuel/git/trees{/sha}","statuses_url":"https://api.github.com/repos/fuel/fuel/statuses/{sha}","languages_url":"https://api.github.com/repos/fuel/fuel/languages","stargazers_url":"https://api.github.com/repos/fuel/fuel/stargazers","contributors_url":"https://api.github.com/repos/fuel/fuel/contributors","subscribers_url":"https://api.github.com/repos/fuel/fuel/subscribers","subscription_url":"https://api.github.com/repos/fuel/fuel/subscription","commits_url":"https://api.github.com/repos/fuel/fuel/commits{/sha}","git_commits_url":"https://api.github.com/repos/fuel/fuel/git/commits{/sha}","comments_url":"https://api.github.com/repos/fuel/fuel/comments{/number}","issue_comment_url":"https://api.github.com/repos/fuel/fuel/issues/comments{/number}","contents_url":"https://api.github.com/repos/fuel/fuel/contents/{+path}","compare_url":"https://api.github.com/repos/fuel/fuel/compare/{base}...{head}","merges_url":"https://api.github.com/repos/fuel/fuel/merges","archive_url":"https://api.github.com/repos/fuel/fuel/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/fuel/fuel/downloads","issues_url":"https://api.github.com/repos/fuel/fuel/issues{/number}","pulls_url":"https://api.github.com/repos/fuel/fuel/pulls{/number}","milestones_url":"https://api.github.com/repos/fuel/fuel/milestones{/number}","notifications_url":"https://api.github.com/repos/fuel/fuel/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/fuel/fuel/labels{/name}","releases_url":"https://api.github.com/repos/fuel/fuel/releases{/id}","created_at":"2010-10-24T18:55:12Z","updated_at":"2015-05-20T06:30:53Z","pushed_at":"2015-05-20T17:06:32Z","git_url":"git://github.com/fuel/fuel.git","ssh_url":"git@github.com:fuel/fuel.git","clone_url":"https://github.com/fuel/fuel.git","svn_url":"https://github.com/fuel/fuel","homepage":"http://fuelphp.com","size":8124,"stargazers_count":1364,"watchers_count":1364,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":256,"mirror_url":null,"open_issues_count":1,"forks":256,"open_issues":1,"watchers":1364,"default_branch":"1.7/master"}},"_links":{"self":{"href":"https://api.github.com/repos/fuel/fuel/pulls/308"},"html":{"href":"https://github.com/fuel/fuel/pull/308"},"issue":{"href":"https://api.github.com/repos/fuel/fuel/issues/308"},"comments":{"href":"https://api.github.com/repos/fuel/fuel/issues/308/comments"},"review_comments":{"href":"https://api.github.com/repos/fuel/fuel/pulls/308/comments"},"review_comment":{"href":"https://api.github.com/repos/fuel/fuel/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/fuel/fuel/pulls/308/commits"},"statuses":{"href":"https://api.github.com/repos/fuel/fuel/statuses/74d97cc5c689d2211a3a2a16f873c01e3900850b"}},"merged":false,"mergeable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"commits":1,"additions":0,"deletions":3,"changed_files":1}}