resolve conflict

typographist · Apr 10, 2018 · 8cf33b8 · 8cf33b8
2 parents 45eeafc + d0b4bce
commit 8cf33b8
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 6,843 deletions.
diff --git a/devtools/.eslintrc b/devtools/.eslintrc
diff --git a/devtools/.gitignore b/devtools/.gitignore
diff --git a/devtools/_source/actions/index.js b/devtools/_source/actions/index.js