rebase cleanup

3 years ago · 21f46941de
parent d00d0ff592
commit 21f46941de
1 changed files with 0 additions and 3 deletions
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@ -10,11 +10,8 @@ export interface CompilerContainerProps {
  api: ICompilerApi,
  compileTabLogic: CompileTabLogic,
  isHardhatProject: boolean,
-<<<<<<< HEAD
  isTruffleProject: boolean,
-=======
  workspaceName: string,
->>>>>>> bc1405382... new file on workspace change.
  tooltip: (message: string | JSX.Element) => void,
  modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
  compiledFileName: string,