Skip to content

N
nebula
Commit bdaa63ec authored by Andreas Bigger's avatar Andreas Bigger
Browse files
Options

Fix factory subcommand merge conflict

parent 673b402d
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
op-challenger/cmd/watch/cmd.go
View file @ bdaa63ec
...@@ -25,8 +25,6 @@ var Subcommands = cli.Commands{ ...@@ -25,8 +25,6 @@ var Subcommands = cli.Commands{
return Oracle(logger, cfg) return Oracle(logger, cfg)
}, },
}, },
<<<<<<< HEAD
=======
{ {
Name: "factory", Name: "factory",
Usage: "Watches the DisputeGameFactory for new dispute games", Usage: "Watches the DisputeGameFactory for new dispute games",
...@@ -45,5 +43,4 @@ var Subcommands = cli.Commands{ ...@@ -45,5 +43,4 @@ var Subcommands = cli.Commands{
return Factory(logger, cfg) return Factory(logger, cfg)
}, },
}, },
>>>>>>> 3d199507d (Add DisputeGameFactory dispute game creation listening logic.)
} }
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