Commit 887a7497 authored by yann300's avatar yann300

fix diff

parent 9aaffa10
...@@ -9,7 +9,6 @@ class AnalysisTab { ...@@ -9,7 +9,6 @@ class AnalysisTab {
this.event = new EventManager() this.event = new EventManager()
this.registry = registry this.registry = registry
} }
<<<<<<< HEAD
profile () { profile () {
return { return {
name: 'solidity static analysis', name: 'solidity static analysis',
...@@ -19,9 +18,6 @@ class AnalysisTab { ...@@ -19,9 +18,6 @@ class AnalysisTab {
description: ' - ' description: ' - '
} }
} }
=======
>>>>>>> 2b6206e1... refactor analysis tab
render () { render () {
var staticanalysis = new StaticAnalysis() var staticanalysis = new StaticAnalysis()
......
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