{"action":"created","issue":{"url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/5","labels_url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/5/labels{/name}","comments_url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/5/comments","events_url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/5/events","html_url":"https://github.com/GrafGenerator/gulp-json-server/pull/5","id":102547229,"number":5,"title":"Develop","user":{"login":"nusson","id":3220226,"avatar_url":"https://avatars.githubusercontent.com/u/3220226?v=3","gravatar_id":"","url":"https://api.github.com/users/nusson","html_url":"https://github.com/nusson","followers_url":"https://api.github.com/users/nusson/followers","following_url":"https://api.github.com/users/nusson/following{/other_user}","gists_url":"https://api.github.com/users/nusson/gists{/gist_id}","starred_url":"https://api.github.com/users/nusson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nusson/subscriptions","organizations_url":"https://api.github.com/users/nusson/orgs","repos_url":"https://api.github.com/users/nusson/repos","events_url":"https://api.github.com/users/nusson/events{/privacy}","received_events_url":"https://api.github.com/users/nusson/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-08-22T16:16:01Z","updated_at":"2015-08-22T17:42:17Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/pulls/5","html_url":"https://github.com/GrafGenerator/gulp-json-server/pull/5","diff_url":"https://github.com/GrafGenerator/gulp-json-server/pull/5.diff","patch_url":"https://github.com/GrafGenerator/gulp-json-server/pull/5.patch"},"body":"merge configid to develop"},"comment":{"url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/comments/133731795","html_url":"https://github.com/GrafGenerator/gulp-json-server/pull/5#issuecomment-133731795","issue_url":"https://api.github.com/repos/GrafGenerator/gulp-json-server/issues/5","id":133731795,"user":{"login":"GrafGenerator","id":4059690,"avatar_url":"https://avatars.githubusercontent.com/u/4059690?v=3","gravatar_id":"","url":"https://api.github.com/users/GrafGenerator","html_url":"https://github.com/GrafGenerator","followers_url":"https://api.github.com/users/GrafGenerator/followers","following_url":"https://api.github.com/users/GrafGenerator/following{/other_user}","gists_url":"https://api.github.com/users/GrafGenerator/gists{/gist_id}","starred_url":"https://api.github.com/users/GrafGenerator/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GrafGenerator/subscriptions","organizations_url":"https://api.github.com/users/GrafGenerator/orgs","repos_url":"https://api.github.com/users/GrafGenerator/repos","events_url":"https://api.github.com/users/GrafGenerator/events{/privacy}","received_events_url":"https://api.github.com/users/GrafGenerator/received_events","type":"User","site_admin":false},"created_at":"2015-08-22T17:42:17Z","updated_at":"2015-08-22T17:42:17Z","body":"@nusson \r\nThere are still conflicts, i guess that you merged not the last version of develop. Generally it's good practice to make PR able to be merged automatically by github. You need to pull develop branch from my repo and merge it into your develop branch, to resolve all conflicts, but if you don't want to do it, i can resolve this by myself:)"}}