{"action":"created","comment":{"url":"https://api.github.com/repos/balloob/home-assistant/pulls/comments/47864640","id":47864640,"diff_hunk":"@@ -63,7 +63,11 @@ https://github.com/pavoni/home-assistant-vera-api/archive/efdba4e63d58a30bc9b36d\n # homeassistant.components.lock.wink\n # homeassistant.components.sensor.wink\n # homeassistant.components.switch.wink\n+<<<<<<< HEAD","path":"requirements_all.txt","position":4,"original_position":4,"commit_id":"cceb79a3786592b68584fc5e5a608545f6e04a31","original_commit_id":"cceb79a3786592b68584fc5e5a608545f6e04a31","user":{"login":"balloob","id":1444314,"avatar_url":"https://avatars.githubusercontent.com/u/1444314?v=3","gravatar_id":"","url":"https://api.github.com/users/balloob","html_url":"https://github.com/balloob","followers_url":"https://api.github.com/users/balloob/followers","following_url":"https://api.github.com/users/balloob/following{/other_user}","gists_url":"https://api.github.com/users/balloob/gists{/gist_id}","starred_url":"https://api.github.com/users/balloob/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/balloob/subscriptions","organizations_url":"https://api.github.com/users/balloob/orgs","repos_url":"https://api.github.com/users/balloob/repos","events_url":"https://api.github.com/users/balloob/events{/privacy}","received_events_url":"https://api.github.com/users/balloob/received_events","type":"User","site_admin":false},"body":"None of these green lines should be here, it should be instead:\r\n```\r\npython-wink==0.3.1\r\n```","created_at":"2015-12-17T03:04:12Z","updated_at":"2015-12-17T03:04:12Z","html_url":"https://github.com/balloob/home-assistant/pull/747#discussion_r47864640","pull_request_url":"https://api.github.com/repos/balloob/home-assistant/pulls/747","_links":{"self":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/comments/47864640"},"html":{"href":"https://github.com/balloob/home-assistant/pull/747#discussion_r47864640"},"pull_request":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/747"}}},"pull_request":{"url":"https://api.github.com/repos/balloob/home-assistant/pulls/747","id":53642410,"html_url":"https://github.com/balloob/home-assistant/pull/747","diff_url":"https://github.com/balloob/home-assistant/pull/747.diff","patch_url":"https://github.com/balloob/home-assistant/pull/747.patch","issue_url":"https://api.github.com/repos/balloob/home-assistant/issues/747","number":747,"state":"open","locked":false,"title":"Added support for the Quirky Egg Minder","user":{"login":"w1ll1am23","id":6432770,"avatar_url":"https://avatars.githubusercontent.com/u/6432770?v=3","gravatar_id":"","url":"https://api.github.com/users/w1ll1am23","html_url":"https://github.com/w1ll1am23","followers_url":"https://api.github.com/users/w1ll1am23/followers","following_url":"https://api.github.com/users/w1ll1am23/following{/other_user}","gists_url":"https://api.github.com/users/w1ll1am23/gists{/gist_id}","starred_url":"https://api.github.com/users/w1ll1am23/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/w1ll1am23/subscriptions","organizations_url":"https://api.github.com/users/w1ll1am23/orgs","repos_url":"https://api.github.com/users/w1ll1am23/repos","events_url":"https://api.github.com/users/w1ll1am23/events{/privacy}","received_events_url":"https://api.github.com/users/w1ll1am23/received_events","type":"User","site_admin":false},"body":"This is dependent upon https://github.com/balloob/python-wink/pull/5 it also currently requires manually setting up the sensor in the config (not discovered by the wink component). I am not sure how to add this to the wink discovery process since this technically isn't a wink \"sensor\"","created_at":"2015-12-15T00:12:25Z","updated_at":"2015-12-17T03:04:12Z","closed_at":null,"merged_at":null,"merge_commit_sha":"1e330bdbd46e14797abdb8b658cf6fbd0f594923","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/balloob/home-assistant/pulls/747/commits","review_comments_url":"https://api.github.com/repos/balloob/home-assistant/pulls/747/comments","review_comment_url":"https://api.github.com/repos/balloob/home-assistant/pulls/comments{/number}","comments_url":"https://api.github.com/repos/balloob/home-assistant/issues/747/comments","statuses_url":"https://api.github.com/repos/balloob/home-assistant/statuses/cceb79a3786592b68584fc5e5a608545f6e04a31","head":{"label":"w1ll1am23:dev","ref":"dev","sha":"cceb79a3786592b68584fc5e5a608545f6e04a31","user":{"login":"w1ll1am23","id":6432770,"avatar_url":"https://avatars.githubusercontent.com/u/6432770?v=3","gravatar_id":"","url":"https://api.github.com/users/w1ll1am23","html_url":"https://github.com/w1ll1am23","followers_url":"https://api.github.com/users/w1ll1am23/followers","following_url":"https://api.github.com/users/w1ll1am23/following{/other_user}","gists_url":"https://api.github.com/users/w1ll1am23/gists{/gist_id}","starred_url":"https://api.github.com/users/w1ll1am23/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/w1ll1am23/subscriptions","organizations_url":"https://api.github.com/users/w1ll1am23/orgs","repos_url":"https://api.github.com/users/w1ll1am23/repos","events_url":"https://api.github.com/users/w1ll1am23/events{/privacy}","received_events_url":"https://api.github.com/users/w1ll1am23/received_events","type":"User","site_admin":false},"repo":{"id":47857916,"name":"home-assistant","full_name":"w1ll1am23/home-assistant","owner":{"login":"w1ll1am23","id":6432770,"avatar_url":"https://avatars.githubusercontent.com/u/6432770?v=3","gravatar_id":"","url":"https://api.github.com/users/w1ll1am23","html_url":"https://github.com/w1ll1am23","followers_url":"https://api.github.com/users/w1ll1am23/followers","following_url":"https://api.github.com/users/w1ll1am23/following{/other_user}","gists_url":"https://api.github.com/users/w1ll1am23/gists{/gist_id}","starred_url":"https://api.github.com/users/w1ll1am23/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/w1ll1am23/subscriptions","organizations_url":"https://api.github.com/users/w1ll1am23/orgs","repos_url":"https://api.github.com/users/w1ll1am23/repos","events_url":"https://api.github.com/users/w1ll1am23/events{/privacy}","received_events_url":"https://api.github.com/users/w1ll1am23/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/w1ll1am23/home-assistant","description":"Open-source home automation platform running on Python 3","fork":true,"url":"https://api.github.com/repos/w1ll1am23/home-assistant","forks_url":"https://api.github.com/repos/w1ll1am23/home-assistant/forks","keys_url":"https://api.github.com/repos/w1ll1am23/home-assistant/keys{/key_id}","collaborators_url":"https://api.github.com/repos/w1ll1am23/home-assistant/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/w1ll1am23/home-assistant/teams","hooks_url":"https://api.github.com/repos/w1ll1am23/home-assistant/hooks","issue_events_url":"https://api.github.com/repos/w1ll1am23/home-assistant/issues/events{/number}","events_url":"https://api.github.com/repos/w1ll1am23/home-assistant/events","assignees_url":"https://api.github.com/repos/w1ll1am23/home-assistant/assignees{/user}","branches_url":"https://api.github.com/repos/w1ll1am23/home-assistant/branches{/branch}","tags_url":"https://api.github.com/repos/w1ll1am23/home-assistant/tags","blobs_url":"https://api.github.com/repos/w1ll1am23/home-assistant/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/w1ll1am23/home-assistant/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/w1ll1am23/home-assistant/git/refs{/sha}","trees_url":"https://api.github.com/repos/w1ll1am23/home-assistant/git/trees{/sha}","statuses_url":"https://api.github.com/repos/w1ll1am23/home-assistant/statuses/{sha}","languages_url":"https://api.github.com/repos/w1ll1am23/home-assistant/languages","stargazers_url":"https://api.github.com/repos/w1ll1am23/home-assistant/stargazers","contributors_url":"https://api.github.com/repos/w1ll1am23/home-assistant/contributors","subscribers_url":"https://api.github.com/repos/w1ll1am23/home-assistant/subscribers","subscription_url":"https://api.github.com/repos/w1ll1am23/home-assistant/subscription","commits_url":"https://api.github.com/repos/w1ll1am23/home-assistant/commits{/sha}","git_commits_url":"https://api.github.com/repos/w1ll1am23/home-assistant/git/commits{/sha}","comments_url":"https://api.github.com/repos/w1ll1am23/home-assistant/comments{/number}","issue_comment_url":"https://api.github.com/repos/w1ll1am23/home-assistant/issues/comments{/number}","contents_url":"https://api.github.com/repos/w1ll1am23/home-assistant/contents/{+path}","compare_url":"https://api.github.com/repos/w1ll1am23/home-assistant/compare/{base}...{head}","merges_url":"https://api.github.com/repos/w1ll1am23/home-assistant/merges","archive_url":"https://api.github.com/repos/w1ll1am23/home-assistant/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/w1ll1am23/home-assistant/downloads","issues_url":"https://api.github.com/repos/w1ll1am23/home-assistant/issues{/number}","pulls_url":"https://api.github.com/repos/w1ll1am23/home-assistant/pulls{/number}","milestones_url":"https://api.github.com/repos/w1ll1am23/home-assistant/milestones{/number}","notifications_url":"https://api.github.com/repos/w1ll1am23/home-assistant/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/w1ll1am23/home-assistant/labels{/name}","releases_url":"https://api.github.com/repos/w1ll1am23/home-assistant/releases{/id}","created_at":"2015-12-12T00:33:01Z","updated_at":"2015-12-12T00:33:03Z","pushed_at":"2015-12-17T00:00:43Z","git_url":"git://github.com/w1ll1am23/home-assistant.git","ssh_url":"git@github.com:w1ll1am23/home-assistant.git","clone_url":"https://github.com/w1ll1am23/home-assistant.git","svn_url":"https://github.com/w1ll1am23/home-assistant","homepage":"https://home-assistant.io","size":31276,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"dev"}},"base":{"label":"balloob:dev","ref":"dev","sha":"7fb5927ac80273d9b5e087defe72765f2ce3227a","user":{"login":"balloob","id":1444314,"avatar_url":"https://avatars.githubusercontent.com/u/1444314?v=3","gravatar_id":"","url":"https://api.github.com/users/balloob","html_url":"https://github.com/balloob","followers_url":"https://api.github.com/users/balloob/followers","following_url":"https://api.github.com/users/balloob/following{/other_user}","gists_url":"https://api.github.com/users/balloob/gists{/gist_id}","starred_url":"https://api.github.com/users/balloob/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/balloob/subscriptions","organizations_url":"https://api.github.com/users/balloob/orgs","repos_url":"https://api.github.com/users/balloob/repos","events_url":"https://api.github.com/users/balloob/events{/privacy}","received_events_url":"https://api.github.com/users/balloob/received_events","type":"User","site_admin":false},"repo":{"id":12888993,"name":"home-assistant","full_name":"balloob/home-assistant","owner":{"login":"balloob","id":1444314,"avatar_url":"https://avatars.githubusercontent.com/u/1444314?v=3","gravatar_id":"","url":"https://api.github.com/users/balloob","html_url":"https://github.com/balloob","followers_url":"https://api.github.com/users/balloob/followers","following_url":"https://api.github.com/users/balloob/following{/other_user}","gists_url":"https://api.github.com/users/balloob/gists{/gist_id}","starred_url":"https://api.github.com/users/balloob/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/balloob/subscriptions","organizations_url":"https://api.github.com/users/balloob/orgs","repos_url":"https://api.github.com/users/balloob/repos","events_url":"https://api.github.com/users/balloob/events{/privacy}","received_events_url":"https://api.github.com/users/balloob/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/balloob/home-assistant","description":"Open-source home automation platform running on Python 3","fork":false,"url":"https://api.github.com/repos/balloob/home-assistant","forks_url":"https://api.github.com/repos/balloob/home-assistant/forks","keys_url":"https://api.github.com/repos/balloob/home-assistant/keys{/key_id}","collaborators_url":"https://api.github.com/repos/balloob/home-assistant/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/balloob/home-assistant/teams","hooks_url":"https://api.github.com/repos/balloob/home-assistant/hooks","issue_events_url":"https://api.github.com/repos/balloob/home-assistant/issues/events{/number}","events_url":"https://api.github.com/repos/balloob/home-assistant/events","assignees_url":"https://api.github.com/repos/balloob/home-assistant/assignees{/user}","branches_url":"https://api.github.com/repos/balloob/home-assistant/branches{/branch}","tags_url":"https://api.github.com/repos/balloob/home-assistant/tags","blobs_url":"https://api.github.com/repos/balloob/home-assistant/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/balloob/home-assistant/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/balloob/home-assistant/git/refs{/sha}","trees_url":"https://api.github.com/repos/balloob/home-assistant/git/trees{/sha}","statuses_url":"https://api.github.com/repos/balloob/home-assistant/statuses/{sha}","languages_url":"https://api.github.com/repos/balloob/home-assistant/languages","stargazers_url":"https://api.github.com/repos/balloob/home-assistant/stargazers","contributors_url":"https://api.github.com/repos/balloob/home-assistant/contributors","subscribers_url":"https://api.github.com/repos/balloob/home-assistant/subscribers","subscription_url":"https://api.github.com/repos/balloob/home-assistant/subscription","commits_url":"https://api.github.com/repos/balloob/home-assistant/commits{/sha}","git_commits_url":"https://api.github.com/repos/balloob/home-assistant/git/commits{/sha}","comments_url":"https://api.github.com/repos/balloob/home-assistant/comments{/number}","issue_comment_url":"https://api.github.com/repos/balloob/home-assistant/issues/comments{/number}","contents_url":"https://api.github.com/repos/balloob/home-assistant/contents/{+path}","compare_url":"https://api.github.com/repos/balloob/home-assistant/compare/{base}...{head}","merges_url":"https://api.github.com/repos/balloob/home-assistant/merges","archive_url":"https://api.github.com/repos/balloob/home-assistant/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/balloob/home-assistant/downloads","issues_url":"https://api.github.com/repos/balloob/home-assistant/issues{/number}","pulls_url":"https://api.github.com/repos/balloob/home-assistant/pulls{/number}","milestones_url":"https://api.github.com/repos/balloob/home-assistant/milestones{/number}","notifications_url":"https://api.github.com/repos/balloob/home-assistant/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/balloob/home-assistant/labels{/name}","releases_url":"https://api.github.com/repos/balloob/home-assistant/releases{/id}","created_at":"2013-09-17T07:29:48Z","updated_at":"2015-12-16T17:29:11Z","pushed_at":"2015-12-17T00:00:44Z","git_url":"git://github.com/balloob/home-assistant.git","ssh_url":"git@github.com:balloob/home-assistant.git","clone_url":"https://github.com/balloob/home-assistant.git","svn_url":"https://github.com/balloob/home-assistant","homepage":"https://home-assistant.io","size":33518,"stargazers_count":2433,"watchers_count":2433,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":true,"forks_count":340,"mirror_url":null,"open_issues_count":89,"forks":340,"open_issues":89,"watchers":2433,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/747"},"html":{"href":"https://github.com/balloob/home-assistant/pull/747"},"issue":{"href":"https://api.github.com/repos/balloob/home-assistant/issues/747"},"comments":{"href":"https://api.github.com/repos/balloob/home-assistant/issues/747/comments"},"review_comments":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/747/comments"},"review_comment":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/balloob/home-assistant/pulls/747/commits"},"statuses":{"href":"https://api.github.com/repos/balloob/home-assistant/statuses/cceb79a3786592b68584fc5e5a608545f6e04a31"}}}}