From 3025f70d953f801e19781472f5cfe0b7e3ab976f Mon Sep 17 00:00:00 2001
From: mattirn <matti.rintanikkola@gmail.com>
Date: Fri, 11 Oct 2019 20:46:48 +0200
Subject: [PATCH] Fixed merge

---
 builtins/src/test/java/org/jline/example/Example.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtins/src/test/java/org/jline/example/Example.java b/builtins/src/test/java/org/jline/example/Example.java
index 577ac8220..8dfa82955 100644
--- a/builtins/src/test/java/org/jline/example/Example.java
+++ b/builtins/src/test/java/org/jline/example/Example.java
@@ -31,6 +31,7 @@
 import org.jline.builtins.Widgets.ArgDesc;
 import org.jline.keymap.KeyMap;
 import org.jline.reader.*;
+import org.jline.reader.LineReader.Option;
 import org.jline.reader.LineReader.SuggestionType;
 import org.jline.reader.impl.DefaultParser;
 import org.jline.reader.impl.DefaultParser.Bracket;