{"action":"created","comment":{"url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/comments/28241269","id":28241269,"diff_hunk":"@@ -1,7 +1,74 @@\n-*.pyc\n+# Byte-compiled / optimized / DLL files\n+__pycache__/\n+*.py[cod]\n+\n+# C extensions\n+*.so\n+\n+# Distribution / packaging\n+.Python\n+env/\n+build/\n+develop-eggs/\n+dist/\n+downloads/\n+eggs/\n+lib/\n+lib64/\n+parts/\n+sdist/\n+var/\n *.egg-info/\n+<<<<<<< HEAD","path":".gitignore","position":23,"original_position":23,"commit_id":"5ca9894be930a6c8f5f51d9875e4e99041628737","original_commit_id":"5ca9894be930a6c8f5f51d9875e4e99041628737","user":{"login":"bmarika","id":6511753,"avatar_url":"https://avatars.githubusercontent.com/u/6511753?v=3","gravatar_id":"","url":"https://api.github.com/users/bmarika","html_url":"https://github.com/bmarika","followers_url":"https://api.github.com/users/bmarika/followers","following_url":"https://api.github.com/users/bmarika/following{/other_user}","gists_url":"https://api.github.com/users/bmarika/gists{/gist_id}","starred_url":"https://api.github.com/users/bmarika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmarika/subscriptions","organizations_url":"https://api.github.com/users/bmarika/orgs","repos_url":"https://api.github.com/users/bmarika/repos","events_url":"https://api.github.com/users/bmarika/events{/privacy}","received_events_url":"https://api.github.com/users/bmarika/received_events","type":"User","site_admin":false},"body":"Merge conflict","created_at":"2015-04-13T14:20:00Z","updated_at":"2015-04-13T14:20:00Z","html_url":"https://github.com/MasterFacilityList/mfl_api/pull/73#discussion_r28241269","pull_request_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73","_links":{"self":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/comments/28241269"},"html":{"href":"https://github.com/MasterFacilityList/mfl_api/pull/73#discussion_r28241269"},"pull_request":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73"}}},"pull_request":{"url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73","id":33160913,"html_url":"https://github.com/MasterFacilityList/mfl_api/pull/73","diff_url":"https://github.com/MasterFacilityList/mfl_api/pull/73.diff","patch_url":"https://github.com/MasterFacilityList/mfl_api/pull/73.patch","issue_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/73","number":73,"state":"open","locked":false,"title":"Enhance setup py publish to pip","user":{"login":"ngurenyaga","id":220600,"avatar_url":"https://avatars.githubusercontent.com/u/220600?v=3","gravatar_id":"","url":"https://api.github.com/users/ngurenyaga","html_url":"https://github.com/ngurenyaga","followers_url":"https://api.github.com/users/ngurenyaga/followers","following_url":"https://api.github.com/users/ngurenyaga/following{/other_user}","gists_url":"https://api.github.com/users/ngurenyaga/gists{/gist_id}","starred_url":"https://api.github.com/users/ngurenyaga/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngurenyaga/subscriptions","organizations_url":"https://api.github.com/users/ngurenyaga/orgs","repos_url":"https://api.github.com/users/ngurenyaga/repos","events_url":"https://api.github.com/users/ngurenyaga/events{/privacy}","received_events_url":"https://api.github.com/users/ngurenyaga/received_events","type":"User","site_admin":false},"body":"Adds the following:\r\n\r\n * a more developed `.gitignore`\r\n * copyright notices\r\n * `MANIFEST.in` and `setup.py`\r\n * some notes on deployment - will be moved into the proper docs later\r\n * more solid versioning\r\n\r\nAnd assorted fixes.","created_at":"2015-04-13T12:57:53Z","updated_at":"2015-04-13T14:20:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"02e190e9e3a1571fdd23ed50101f39c9be68abc5","assignee":{"login":"bmarika","id":6511753,"avatar_url":"https://avatars.githubusercontent.com/u/6511753?v=3","gravatar_id":"","url":"https://api.github.com/users/bmarika","html_url":"https://github.com/bmarika","followers_url":"https://api.github.com/users/bmarika/followers","following_url":"https://api.github.com/users/bmarika/following{/other_user}","gists_url":"https://api.github.com/users/bmarika/gists{/gist_id}","starred_url":"https://api.github.com/users/bmarika/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bmarika/subscriptions","organizations_url":"https://api.github.com/users/bmarika/orgs","repos_url":"https://api.github.com/users/bmarika/repos","events_url":"https://api.github.com/users/bmarika/events{/privacy}","received_events_url":"https://api.github.com/users/bmarika/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/MasterFacilityList/mfl_api/milestones/1","html_url":"https://github.com/MasterFacilityList/mfl_api/milestones/ALPHA","labels_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/milestones/1/labels","id":1044206,"number":1,"title":"ALPHA","description":null,"creator":{"login":"ngurenyaga","id":220600,"avatar_url":"https://avatars.githubusercontent.com/u/220600?v=3","gravatar_id":"","url":"https://api.github.com/users/ngurenyaga","html_url":"https://github.com/ngurenyaga","followers_url":"https://api.github.com/users/ngurenyaga/followers","following_url":"https://api.github.com/users/ngurenyaga/following{/other_user}","gists_url":"https://api.github.com/users/ngurenyaga/gists{/gist_id}","starred_url":"https://api.github.com/users/ngurenyaga/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ngurenyaga/subscriptions","organizations_url":"https://api.github.com/users/ngurenyaga/orgs","repos_url":"https://api.github.com/users/ngurenyaga/repos","events_url":"https://api.github.com/users/ngurenyaga/events{/privacy}","received_events_url":"https://api.github.com/users/ngurenyaga/received_events","type":"User","site_admin":false},"open_issues":47,"closed_issues":12,"state":"open","created_at":"2015-03-30T07:55:01Z","updated_at":"2015-04-13T12:57:53Z","due_on":null,"closed_at":null},"commits_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73/commits","review_comments_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73/comments","review_comment_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/comments{/number}","comments_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/73/comments","statuses_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/statuses/5ca9894be930a6c8f5f51d9875e4e99041628737","head":{"label":"MasterFacilityList:enhance_setup_py_publish_to_pip","ref":"enhance_setup_py_publish_to_pip","sha":"5ca9894be930a6c8f5f51d9875e4e99041628737","user":{"login":"MasterFacilityList","id":11611058,"avatar_url":"https://avatars.githubusercontent.com/u/11611058?v=3","gravatar_id":"","url":"https://api.github.com/users/MasterFacilityList","html_url":"https://github.com/MasterFacilityList","followers_url":"https://api.github.com/users/MasterFacilityList/followers","following_url":"https://api.github.com/users/MasterFacilityList/following{/other_user}","gists_url":"https://api.github.com/users/MasterFacilityList/gists{/gist_id}","starred_url":"https://api.github.com/users/MasterFacilityList/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MasterFacilityList/subscriptions","organizations_url":"https://api.github.com/users/MasterFacilityList/orgs","repos_url":"https://api.github.com/users/MasterFacilityList/repos","events_url":"https://api.github.com/users/MasterFacilityList/events{/privacy}","received_events_url":"https://api.github.com/users/MasterFacilityList/received_events","type":"Organization","site_admin":false},"repo":{"id":32854024,"name":"mfl_api","full_name":"MasterFacilityList/mfl_api","owner":{"login":"MasterFacilityList","id":11611058,"avatar_url":"https://avatars.githubusercontent.com/u/11611058?v=3","gravatar_id":"","url":"https://api.github.com/users/MasterFacilityList","html_url":"https://github.com/MasterFacilityList","followers_url":"https://api.github.com/users/MasterFacilityList/followers","following_url":"https://api.github.com/users/MasterFacilityList/following{/other_user}","gists_url":"https://api.github.com/users/MasterFacilityList/gists{/gist_id}","starred_url":"https://api.github.com/users/MasterFacilityList/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MasterFacilityList/subscriptions","organizations_url":"https://api.github.com/users/MasterFacilityList/orgs","repos_url":"https://api.github.com/users/MasterFacilityList/repos","events_url":"https://api.github.com/users/MasterFacilityList/events{/privacy}","received_events_url":"https://api.github.com/users/MasterFacilityList/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MasterFacilityList/mfl_api","description":"The master facilty list Kenya","fork":false,"url":"https://api.github.com/repos/MasterFacilityList/mfl_api","forks_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/forks","keys_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/teams","hooks_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/hooks","issue_events_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/events{/number}","events_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/events","assignees_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/assignees{/user}","branches_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/branches{/branch}","tags_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/tags","blobs_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/refs{/sha}","trees_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/statuses/{sha}","languages_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/languages","stargazers_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/stargazers","contributors_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/contributors","subscribers_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/subscribers","subscription_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/subscription","commits_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/commits{/sha}","git_commits_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/commits{/sha}","comments_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/comments{/number}","issue_comment_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/comments{/number}","contents_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/contents/{+path}","compare_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/merges","archive_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/downloads","issues_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues{/number}","pulls_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls{/number}","milestones_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/milestones{/number}","notifications_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/labels{/name}","releases_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/releases{/id}","created_at":"2015-03-25T09:14:34Z","updated_at":"2015-04-13T10:56:03Z","pushed_at":"2015-04-13T14:15:52Z","git_url":"git://github.com/MasterFacilityList/mfl_api.git","ssh_url":"git@github.com:MasterFacilityList/mfl_api.git","clone_url":"https://github.com/MasterFacilityList/mfl_api.git","svn_url":"https://github.com/MasterFacilityList/mfl_api","homepage":"https://www.ehealth.or.ke","size":636,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":55,"forks":0,"open_issues":55,"watchers":0,"default_branch":"master"}},"base":{"label":"MasterFacilityList:common_models","ref":"common_models","sha":"ef0908e0c1fca2db6a2b8ec3fa0f2d06ffa00c8e","user":{"login":"MasterFacilityList","id":11611058,"avatar_url":"https://avatars.githubusercontent.com/u/11611058?v=3","gravatar_id":"","url":"https://api.github.com/users/MasterFacilityList","html_url":"https://github.com/MasterFacilityList","followers_url":"https://api.github.com/users/MasterFacilityList/followers","following_url":"https://api.github.com/users/MasterFacilityList/following{/other_user}","gists_url":"https://api.github.com/users/MasterFacilityList/gists{/gist_id}","starred_url":"https://api.github.com/users/MasterFacilityList/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MasterFacilityList/subscriptions","organizations_url":"https://api.github.com/users/MasterFacilityList/orgs","repos_url":"https://api.github.com/users/MasterFacilityList/repos","events_url":"https://api.github.com/users/MasterFacilityList/events{/privacy}","received_events_url":"https://api.github.com/users/MasterFacilityList/received_events","type":"Organization","site_admin":false},"repo":{"id":32854024,"name":"mfl_api","full_name":"MasterFacilityList/mfl_api","owner":{"login":"MasterFacilityList","id":11611058,"avatar_url":"https://avatars.githubusercontent.com/u/11611058?v=3","gravatar_id":"","url":"https://api.github.com/users/MasterFacilityList","html_url":"https://github.com/MasterFacilityList","followers_url":"https://api.github.com/users/MasterFacilityList/followers","following_url":"https://api.github.com/users/MasterFacilityList/following{/other_user}","gists_url":"https://api.github.com/users/MasterFacilityList/gists{/gist_id}","starred_url":"https://api.github.com/users/MasterFacilityList/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MasterFacilityList/subscriptions","organizations_url":"https://api.github.com/users/MasterFacilityList/orgs","repos_url":"https://api.github.com/users/MasterFacilityList/repos","events_url":"https://api.github.com/users/MasterFacilityList/events{/privacy}","received_events_url":"https://api.github.com/users/MasterFacilityList/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MasterFacilityList/mfl_api","description":"The master facilty list Kenya","fork":false,"url":"https://api.github.com/repos/MasterFacilityList/mfl_api","forks_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/forks","keys_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/teams","hooks_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/hooks","issue_events_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/events{/number}","events_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/events","assignees_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/assignees{/user}","branches_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/branches{/branch}","tags_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/tags","blobs_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/refs{/sha}","trees_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/statuses/{sha}","languages_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/languages","stargazers_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/stargazers","contributors_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/contributors","subscribers_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/subscribers","subscription_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/subscription","commits_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/commits{/sha}","git_commits_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/git/commits{/sha}","comments_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/comments{/number}","issue_comment_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/comments{/number}","contents_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/contents/{+path}","compare_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/merges","archive_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/downloads","issues_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues{/number}","pulls_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls{/number}","milestones_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/milestones{/number}","notifications_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/labels{/name}","releases_url":"https://api.github.com/repos/MasterFacilityList/mfl_api/releases{/id}","created_at":"2015-03-25T09:14:34Z","updated_at":"2015-04-13T10:56:03Z","pushed_at":"2015-04-13T14:15:52Z","git_url":"git://github.com/MasterFacilityList/mfl_api.git","ssh_url":"git@github.com:MasterFacilityList/mfl_api.git","clone_url":"https://github.com/MasterFacilityList/mfl_api.git","svn_url":"https://github.com/MasterFacilityList/mfl_api","homepage":"https://www.ehealth.or.ke","size":636,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":55,"forks":0,"open_issues":55,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73"},"html":{"href":"https://github.com/MasterFacilityList/mfl_api/pull/73"},"issue":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/73"},"comments":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/issues/73/comments"},"review_comments":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73/comments"},"review_comment":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/pulls/73/commits"},"statuses":{"href":"https://api.github.com/repos/MasterFacilityList/mfl_api/statuses/5ca9894be930a6c8f5f51d9875e4e99041628737"}}}}