Fix merge conflict

vaadin · Nov 23, 2020 · 7501575 · 7501575
1 parent b0da67d
commit 7501575
Showing 1 changed file with 1 addition and 0 deletions.
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
@@ -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");