ready

lopudesigns · Oct 7, 2018 · 6218ea0 · 6218ea0
1 parent aef9774
commit 6218ea0
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ Makefile
 compile_commands.json
 moc_*
 *.moc
+.idea
 hardfork.hpp
 
 lcov

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.npmignore b/.npmignore
@@ -8,6 +8,7 @@ Makefile
 compile_commands.json
 moc_*
 *.moc
+.idea
 hardfork.hpp
 
 lcov

diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "push": "./scripts/push.sh",
-    "pull": "./scripts/pull.sh",
+    "push": "git add . ; git commit -m 'ready' ; git push origin dev",
+    "pull": "git pull origin dev",
     "gitmodules": "git submodule update --init --recursive",
     "submodules": "npm run gitmodules",
     "generateArgumentsDev": "./scripts/generate-arguments-genesis.sh && cat scripts/generate-arguments-genesis.output",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ Makefile @@
     compile_commands.json
     moc_*
     *.moc
+    .idea
     hardfork.hpp
     lcov
@@ Expand Down @@