From b39b9db77041c1b622f6af8b1b92228d48bbc7c1 Mon Sep 17 00:00:00 2001 From: Teemu R Date: Fri, 11 Jan 2019 21:02:06 +0100 Subject: [PATCH] Fix broken merge (#8137) 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. --- source/lovelace/yaml-mode.markdown | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/source/lovelace/yaml-mode.markdown b/source/lovelace/yaml-mode.markdown index f60eabed69d..276c594a368 100644 --- a/source/lovelace/yaml-mode.markdown +++ b/source/lovelace/yaml-mode.markdown @@ -52,13 +52,8 @@ excluded_entities: views: # View tab title. - 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} path: example ->>>>>>> origin/current # Optional background (overwrites the global background). background: radial-gradient(crimson, skyblue) # 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. cards: # 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 ->>>>>>> origin/current entities: - device_tracker.paulus - device_tracker.anne_there