jeans/home-assistant.io
jeans/home-assistant.io
1
0
Fork 0
mirror of https://github.com/home-assistant/home-assistant.io.git synced 2025-07-18 14:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict (#8653)

Browse Source
This commit is contained in:
Daniel Høyer Iversen 2019-02-20 21:32:58 +01:00 committed by Fabian Affolter
parent 28d0f2fe4a
commit 9cdfdc8710
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/_includes/asides/component_navigation.html
View File

@ -60,7 +60,6 @@
</div> </div>
{%- endif -%} {%- endif -%}
<<<<<<< HEAD
<div class='section'> <div class='section'>
{%- if is_platform -%} {%- if is_platform -%}
Source: <a href='{{github_main_repo}}{{imp_url}}{{parent_name}}.py'>{{imp_name}}/{{parent_name}}.py</a> Source: <a href='{{github_main_repo}}{{imp_url}}{{parent_name}}.py'>{{imp_name}}/{{parent_name}}.py</a>
@ -68,14 +67,6 @@
Source: <a href='{{github_main_repo}}{{imp_url}}'>{{imp_url}}</a> Source: <a href='{{github_main_repo}}{{imp_url}}'>{{imp_url}}</a>
{%- endif -%} {%- endif -%}
</div> </div>
=======
{%- if is_platform -%}
<div class='section'>
Source:
<a href='{{github_main_repo}}{{embedded_url}}{{parent_name}}.py'>{{imp_name}}/{{parent_name}}.py</a>
</div>
{%- endif -%}
>>>>>>> rc
{%- if is_platform and parent_name != 'sensor' -%} {%- if is_platform and parent_name != 'sensor' -%}
<div class='section'> <div class='section'>