Merge branch 'master' of github.com:Daolab/beakeros-evm1

Daohub-io · May 19, 2019 · ec9e548 · ec9e548
2 parents 7f84e0d + e02a262
commit ec9e548
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,10 @@ chain
 #
 #already existing elements are commented out
 
+<<<<<<< HEAD
 kernel-ewasm/target/*
+=======
+/target
+>>>>>>> e02a2624942c5311a30ad3a7aec794205a6c762a
 **/*.rs.bk
 Cargo.lock
diff --git a/README.md b/README.md