Correcting branch case issue for deployment building.
This commit is contained in:
parent
fa78ffc1b7
commit
5778b63e8e
1 changed files with 0 additions and 4 deletions
|
|
@ -1,9 +1,5 @@
|
|||
import React from "react";
|
||||
<<<<<<< HEAD:src/app/index.jsx
|
||||
import ChatLayout from "../components/ui/ChatLayout";
|
||||
=======
|
||||
import ChatLayout from "src/components/layouts/chat-layout";
|
||||
>>>>>>> cb9cff44215b6de81ed81ef2a1c6abe090fbf1b1:web-app/src/app/index.jsx
|
||||
|
||||
function App() {
|
||||
return (
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue