Skip to content

B
baas-ide
Commit 990802cd authored by LianaHus's avatar LianaHus
Browse files
Options

fixing conflict

parent e9a96d0c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx
View file @ 990802cd
...@@ -189,6 +189,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => { ...@@ -189,6 +189,7 @@ export const DebuggerUI = (props: DebuggerUIProps) => {
const debug = (txHash) => { const debug = (txHash) => {
startDebugging(null, txHash, null) startDebugging(null, txHash, null)
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
const deleteHighlights = async () => { const deleteHighlights = async () => {
...@@ -200,6 +201,9 @@ const deleteHighlights = async () => { ...@@ -200,6 +201,9 @@ const deleteHighlights = async () => {
} }
>>>>>>> 1b1d8f0c7... modal dialog in react >>>>>>> 1b1d8f0c7... modal dialog in react
=======
>>>>>>> c941558da... fixing conflict
const stepManager = { const stepManager = {
jumpTo: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.jumpTo.bind(state.debugger.step_manager) : null, jumpTo: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.jumpTo.bind(state.debugger.step_manager) : null,
stepOverBack: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.stepOverBack.bind(state.debugger.step_manager) : null, stepOverBack: state.debugger && state.debugger.step_manager ? state.debugger.step_manager.stepOverBack.bind(state.debugger.step_manager) : null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment