{"action":"created","comment":{"url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/comments/105764282","pull_request_review_id":26659380,"id":105764282,"diff_hunk":"@@ -1,8 +1,13 @@\n # coding: utf-8\n \"\"\"Constants used by Home Assistant components.\"\"\"\n MAJOR_VERSION = 0\n+<<<<<<< HEAD","path":"homeassistant/const.py","position":4,"original_position":4,"commit_id":"41a519f7749604c6fc0dfb03b280de6b5e8f4146","original_commit_id":"41a519f7749604c6fc0dfb03b280de6b5e8f4146","user":{"login":"houndci-bot","id":6697940,"avatar_url":"https://avatars3.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci-bot","html_url":"https://github.com/houndci-bot","followers_url":"https://api.github.com/users/houndci-bot/followers","following_url":"https://api.github.com/users/houndci-bot/following{/other_user}","gists_url":"https://api.github.com/users/houndci-bot/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci-bot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci-bot/subscriptions","organizations_url":"https://api.github.com/users/houndci-bot/orgs","repos_url":"https://api.github.com/users/houndci-bot/repos","events_url":"https://api.github.com/users/houndci-bot/events{/privacy}","received_events_url":"https://api.github.com/users/houndci-bot/received_events","type":"User","site_admin":false},"body":"SyntaxError: invalid syntax<br>missing whitespace around bitwise or shift operator<br>missing whitespace around operator","created_at":"2017-03-13T20:33:39Z","updated_at":"2017-03-13T20:33:39Z","html_url":"https://github.com/home-assistant/home-assistant/pull/6597#discussion_r105764282","pull_request_url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597","_links":{"self":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/comments/105764282"},"html":{"href":"https://github.com/home-assistant/home-assistant/pull/6597#discussion_r105764282"},"pull_request":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597"}}},"pull_request":{"url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597","id":110491660,"html_url":"https://github.com/home-assistant/home-assistant/pull/6597","diff_url":"https://github.com/home-assistant/home-assistant/pull/6597.diff","patch_url":"https://github.com/home-assistant/home-assistant/pull/6597.patch","issue_url":"https://api.github.com/repos/home-assistant/home-assistant/issues/6597","number":6597,"state":"open","locked":false,"title":"Fix #6534","user":{"login":"deisi","id":5436980,"avatar_url":"https://avatars0.githubusercontent.com/u/5436980?v=3","gravatar_id":"","url":"https://api.github.com/users/deisi","html_url":"https://github.com/deisi","followers_url":"https://api.github.com/users/deisi/followers","following_url":"https://api.github.com/users/deisi/following{/other_user}","gists_url":"https://api.github.com/users/deisi/gists{/gist_id}","starred_url":"https://api.github.com/users/deisi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deisi/subscriptions","organizations_url":"https://api.github.com/users/deisi/orgs","repos_url":"https://api.github.com/users/deisi/repos","events_url":"https://api.github.com/users/deisi/events{/privacy}","received_events_url":"https://api.github.com/users/deisi/received_events","type":"User","site_admin":false},"body":"## Description:\r\nFixes  ZeroDivisionError if temperature value is not available in osramlightify light.\r\n\r\n**Related issue (if applicable):** fixes #6534\r\n\r\n**Pull request in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io) with documentation (if applicable):** home-assistant/home-assistant.github.io#<home-assistant.github.io PR number goes here>\r\n\r\n## Example entry for `configuration.yaml` (if applicable):\r\n```yaml\r\n\r\n```\r\n\r\n## Checklist:\r\n\r\nIf user exposed functionality or configuration variables are added/changed:\r\n  - [ ] Documentation added/updated in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io)\r\n\r\nIf the code communicates with devices, web services, or third-party tools:\r\n  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**\r\n  - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).\r\n  - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).\r\n  - [ ] New dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.\r\n  - [ ] New files were added to `.coveragerc`.\r\n\r\nIf the code does not interact with devices:\r\n  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**\r\n  - [ ] Tests have been added to verify that the new code works.\r\n\r\n[ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L14\r\n[ex-import]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L54\r\n","created_at":"2017-03-13T20:33:29Z","updated_at":"2017-03-13T20:33:39Z","closed_at":null,"merged_at":null,"merge_commit_sha":"11107bbada3ce1af808744f5ed334ce9cde615ae","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597/commits","review_comments_url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597/comments","review_comment_url":"https://api.github.com/repos/home-assistant/home-assistant/pulls/comments{/number}","comments_url":"https://api.github.com/repos/home-assistant/home-assistant/issues/6597/comments","statuses_url":"https://api.github.com/repos/home-assistant/home-assistant/statuses/41a519f7749604c6fc0dfb03b280de6b5e8f4146","head":{"label":"deisi:fix_#6534","ref":"fix_#6534","sha":"41a519f7749604c6fc0dfb03b280de6b5e8f4146","user":{"login":"deisi","id":5436980,"avatar_url":"https://avatars0.githubusercontent.com/u/5436980?v=3","gravatar_id":"","url":"https://api.github.com/users/deisi","html_url":"https://github.com/deisi","followers_url":"https://api.github.com/users/deisi/followers","following_url":"https://api.github.com/users/deisi/following{/other_user}","gists_url":"https://api.github.com/users/deisi/gists{/gist_id}","starred_url":"https://api.github.com/users/deisi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deisi/subscriptions","organizations_url":"https://api.github.com/users/deisi/orgs","repos_url":"https://api.github.com/users/deisi/repos","events_url":"https://api.github.com/users/deisi/events{/privacy}","received_events_url":"https://api.github.com/users/deisi/received_events","type":"User","site_admin":false},"repo":{"id":31808360,"name":"home-assistant","full_name":"deisi/home-assistant","owner":{"login":"deisi","id":5436980,"avatar_url":"https://avatars0.githubusercontent.com/u/5436980?v=3","gravatar_id":"","url":"https://api.github.com/users/deisi","html_url":"https://github.com/deisi","followers_url":"https://api.github.com/users/deisi/followers","following_url":"https://api.github.com/users/deisi/following{/other_user}","gists_url":"https://api.github.com/users/deisi/gists{/gist_id}","starred_url":"https://api.github.com/users/deisi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deisi/subscriptions","organizations_url":"https://api.github.com/users/deisi/orgs","repos_url":"https://api.github.com/users/deisi/repos","events_url":"https://api.github.com/users/deisi/events{/privacy}","received_events_url":"https://api.github.com/users/deisi/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/deisi/home-assistant","description":"Open-source home automation platform running on Python 3","fork":true,"url":"https://api.github.com/repos/deisi/home-assistant","forks_url":"https://api.github.com/repos/deisi/home-assistant/forks","keys_url":"https://api.github.com/repos/deisi/home-assistant/keys{/key_id}","collaborators_url":"https://api.github.com/repos/deisi/home-assistant/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/deisi/home-assistant/teams","hooks_url":"https://api.github.com/repos/deisi/home-assistant/hooks","issue_events_url":"https://api.github.com/repos/deisi/home-assistant/issues/events{/number}","events_url":"https://api.github.com/repos/deisi/home-assistant/events","assignees_url":"https://api.github.com/repos/deisi/home-assistant/assignees{/user}","branches_url":"https://api.github.com/repos/deisi/home-assistant/branches{/branch}","tags_url":"https://api.github.com/repos/deisi/home-assistant/tags","blobs_url":"https://api.github.com/repos/deisi/home-assistant/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/deisi/home-assistant/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/deisi/home-assistant/git/refs{/sha}","trees_url":"https://api.github.com/repos/deisi/home-assistant/git/trees{/sha}","statuses_url":"https://api.github.com/repos/deisi/home-assistant/statuses/{sha}","languages_url":"https://api.github.com/repos/deisi/home-assistant/languages","stargazers_url":"https://api.github.com/repos/deisi/home-assistant/stargazers","contributors_url":"https://api.github.com/repos/deisi/home-assistant/contributors","subscribers_url":"https://api.github.com/repos/deisi/home-assistant/subscribers","subscription_url":"https://api.github.com/repos/deisi/home-assistant/subscription","commits_url":"https://api.github.com/repos/deisi/home-assistant/commits{/sha}","git_commits_url":"https://api.github.com/repos/deisi/home-assistant/git/commits{/sha}","comments_url":"https://api.github.com/repos/deisi/home-assistant/comments{/number}","issue_comment_url":"https://api.github.com/repos/deisi/home-assistant/issues/comments{/number}","contents_url":"https://api.github.com/repos/deisi/home-assistant/contents/{+path}","compare_url":"https://api.github.com/repos/deisi/home-assistant/compare/{base}...{head}","merges_url":"https://api.github.com/repos/deisi/home-assistant/merges","archive_url":"https://api.github.com/repos/deisi/home-assistant/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/deisi/home-assistant/downloads","issues_url":"https://api.github.com/repos/deisi/home-assistant/issues{/number}","pulls_url":"https://api.github.com/repos/deisi/home-assistant/pulls{/number}","milestones_url":"https://api.github.com/repos/deisi/home-assistant/milestones{/number}","notifications_url":"https://api.github.com/repos/deisi/home-assistant/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/deisi/home-assistant/labels{/name}","releases_url":"https://api.github.com/repos/deisi/home-assistant/releases{/id}","deployments_url":"https://api.github.com/repos/deisi/home-assistant/deployments","created_at":"2015-03-07T10:16:46Z","updated_at":"2016-03-28T17:22:38Z","pushed_at":"2017-03-13T20:31:24Z","git_url":"git://github.com/deisi/home-assistant.git","ssh_url":"git@github.com:deisi/home-assistant.git","clone_url":"https://github.com/deisi/home-assistant.git","svn_url":"https://github.com/deisi/home-assistant","homepage":"https://home-assistant.io","size":56185,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"home-assistant:dev","ref":"dev","sha":"f450c1351c7d48cf31639ef24a1195831a42f297","user":{"login":"home-assistant","id":13844975,"avatar_url":"https://avatars0.githubusercontent.com/u/13844975?v=3","gravatar_id":"","url":"https://api.github.com/users/home-assistant","html_url":"https://github.com/home-assistant","followers_url":"https://api.github.com/users/home-assistant/followers","following_url":"https://api.github.com/users/home-assistant/following{/other_user}","gists_url":"https://api.github.com/users/home-assistant/gists{/gist_id}","starred_url":"https://api.github.com/users/home-assistant/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/home-assistant/subscriptions","organizations_url":"https://api.github.com/users/home-assistant/orgs","repos_url":"https://api.github.com/users/home-assistant/repos","events_url":"https://api.github.com/users/home-assistant/events{/privacy}","received_events_url":"https://api.github.com/users/home-assistant/received_events","type":"Organization","site_admin":false},"repo":{"id":12888993,"name":"home-assistant","full_name":"home-assistant/home-assistant","owner":{"login":"home-assistant","id":13844975,"avatar_url":"https://avatars0.githubusercontent.com/u/13844975?v=3","gravatar_id":"","url":"https://api.github.com/users/home-assistant","html_url":"https://github.com/home-assistant","followers_url":"https://api.github.com/users/home-assistant/followers","following_url":"https://api.github.com/users/home-assistant/following{/other_user}","gists_url":"https://api.github.com/users/home-assistant/gists{/gist_id}","starred_url":"https://api.github.com/users/home-assistant/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/home-assistant/subscriptions","organizations_url":"https://api.github.com/users/home-assistant/orgs","repos_url":"https://api.github.com/users/home-assistant/repos","events_url":"https://api.github.com/users/home-assistant/events{/privacy}","received_events_url":"https://api.github.com/users/home-assistant/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/home-assistant/home-assistant","description":":house_with_garden: Open-source home automation platform running on Python 3","fork":false,"url":"https://api.github.com/repos/home-assistant/home-assistant","forks_url":"https://api.github.com/repos/home-assistant/home-assistant/forks","keys_url":"https://api.github.com/repos/home-assistant/home-assistant/keys{/key_id}","collaborators_url":"https://api.github.com/repos/home-assistant/home-assistant/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/home-assistant/home-assistant/teams","hooks_url":"https://api.github.com/repos/home-assistant/home-assistant/hooks","issue_events_url":"https://api.github.com/repos/home-assistant/home-assistant/issues/events{/number}","events_url":"https://api.github.com/repos/home-assistant/home-assistant/events","assignees_url":"https://api.github.com/repos/home-assistant/home-assistant/assignees{/user}","branches_url":"https://api.github.com/repos/home-assistant/home-assistant/branches{/branch}","tags_url":"https://api.github.com/repos/home-assistant/home-assistant/tags","blobs_url":"https://api.github.com/repos/home-assistant/home-assistant/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/home-assistant/home-assistant/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/home-assistant/home-assistant/git/refs{/sha}","trees_url":"https://api.github.com/repos/home-assistant/home-assistant/git/trees{/sha}","statuses_url":"https://api.github.com/repos/home-assistant/home-assistant/statuses/{sha}","languages_url":"https://api.github.com/repos/home-assistant/home-assistant/languages","stargazers_url":"https://api.github.com/repos/home-assistant/home-assistant/stargazers","contributors_url":"https://api.github.com/repos/home-assistant/home-assistant/contributors","subscribers_url":"https://api.github.com/repos/home-assistant/home-assistant/subscribers","subscription_url":"https://api.github.com/repos/home-assistant/home-assistant/subscription","commits_url":"https://api.github.com/repos/home-assistant/home-assistant/commits{/sha}","git_commits_url":"https://api.github.com/repos/home-assistant/home-assistant/git/commits{/sha}","comments_url":"https://api.github.com/repos/home-assistant/home-assistant/comments{/number}","issue_comment_url":"https://api.github.com/repos/home-assistant/home-assistant/issues/comments{/number}","contents_url":"https://api.github.com/repos/home-assistant/home-assistant/contents/{+path}","compare_url":"https://api.github.com/repos/home-assistant/home-assistant/compare/{base}...{head}","merges_url":"https://api.github.com/repos/home-assistant/home-assistant/merges","archive_url":"https://api.github.com/repos/home-assistant/home-assistant/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/home-assistant/home-assistant/downloads","issues_url":"https://api.github.com/repos/home-assistant/home-assistant/issues{/number}","pulls_url":"https://api.github.com/repos/home-assistant/home-assistant/pulls{/number}","milestones_url":"https://api.github.com/repos/home-assistant/home-assistant/milestones{/number}","notifications_url":"https://api.github.com/repos/home-assistant/home-assistant/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/home-assistant/home-assistant/labels{/name}","releases_url":"https://api.github.com/repos/home-assistant/home-assistant/releases{/id}","deployments_url":"https://api.github.com/repos/home-assistant/home-assistant/deployments","created_at":"2013-09-17T07:29:48Z","updated_at":"2017-03-13T19:50:14Z","pushed_at":"2017-03-13T20:33:30Z","git_url":"git://github.com/home-assistant/home-assistant.git","ssh_url":"git@github.com:home-assistant/home-assistant.git","clone_url":"https://github.com/home-assistant/home-assistant.git","svn_url":"https://github.com/home-assistant/home-assistant","homepage":"https://home-assistant.io","size":54804,"stargazers_count":6157,"watchers_count":6157,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1775,"mirror_url":null,"open_issues_count":504,"forks":1775,"open_issues":504,"watchers":6157,"default_branch":"dev"}},"_links":{"self":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597"},"html":{"href":"https://github.com/home-assistant/home-assistant/pull/6597"},"issue":{"href":"https://api.github.com/repos/home-assistant/home-assistant/issues/6597"},"comments":{"href":"https://api.github.com/repos/home-assistant/home-assistant/issues/6597/comments"},"review_comments":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597/comments"},"review_comment":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/home-assistant/home-assistant/pulls/6597/commits"},"statuses":{"href":"https://api.github.com/repos/home-assistant/home-assistant/statuses/41a519f7749604c6fc0dfb03b280de6b5e8f4146"}}}}
{"actor":{"display_login":"houndci-bot"}}