From 7501575886343bd216ed8e80e25b78542b28e561 Mon Sep 17 00:00:00 2001
From: Mikael Grankvist <mikael.grankvist@vaadin.com>
Date: Mon, 23 Nov 2020 14:55:38 +0200
Subject: [PATCH] Fix merge conflict

---
 .../src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java
index 4a27a0ac2de..93ae1a347a7 100644
--- a/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java
+++ b/flow-tests/test-themes/src/main/java/com/vaadin/flow/uitest/ui/theme/ThemeView.java
@@ -25,6 +25,7 @@ public class ThemeView extends Div {
 
     public static final String MY_POLYMER_ID = "field";
     public static final String MY_LIT_ID = "button";
+    public static final String TEST_TEXT_ID = "test-text";
 
     public ThemeView() {
         final Span textSpan = new Span("This is the theme test view");