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-19 15:26:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken merge (#8137)

Browse Source 
Untested, but according to discord this should be the correct side of the merge, please feel free to modify as needed, I just create this PR to make the issue known.
This commit is contained in:
Teemu R 2019-01-11 21:02:06 +01:00 committed by Fabian Affolter
parent 9e6ba96f79
commit b39b9db770
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/lovelace/yaml-mode.markdown
View File

@ -52,13 +52,8 @@ excluded_entities:
views: views:
# View tab title. # View tab title.
- title: Example - title: Example
<<<<<<< HEAD
# Unique id for direct access /lovelace/${id} and editing it from the UI.
id: example
=======
# Unique path for direct access /lovelace/${path} # Unique path for direct access /lovelace/${path}
path: example path: example
>>>>>>> origin/current
# Optional background (overwrites the global background). # Optional background (overwrites the global background).
background: radial-gradient(crimson, skyblue) background: radial-gradient(crimson, skyblue)
# Each view can have a different theme applied. Theme should be defined in the frontend. # Each view can have a different theme applied. Theme should be defined in the frontend.
@ -66,12 +61,7 @@ views:
# The cards to show on this view. # The cards to show on this view.
cards: cards:
# The filter card will filter entities for their state # The filter card will filter entities for their state
<<<<<<< HEAD
- id: peoplehome # Every card needs an ID, for it to be edited from the UI.
type: entity-filter
=======
- type: entity-filter - type: entity-filter
>>>>>>> origin/current
entities: entities:
- device_tracker.paulus - device_tracker.paulus
- device_tracker.anne_there - device_tracker.anne_there