Skip to content

Commit 72b6443

Browse files
feat(ui5-ai-input): resolve conflicts
1 parent 8d09a5b commit 72b6443

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

packages/ai/src/bundle.esm.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ import "./Assets.js";
77
import Button from "./Button.js";
88
import ButtonState from "./ButtonState.js";
99
import PromptInput from "./PromptInput.js";
10-
<<<<<<< Updated upstream
11-
import AITextArea from "./AITextArea.js";
12-
=======
1310
import AITextArea from "./TextArea.js";
1411
import AIInput from "./AIInput.js";
15-
>>>>>>> Stashed changes
1612

1713
export default testAssets;

0 commit comments

Comments
 (0)