From 6218ea0f75aa364c14a1c684d1e9fcf713a51336 Mon Sep 17 00:00:00 2001 From: lopu Date: Sun, 7 Oct 2018 18:18:15 +1100 Subject: [PATCH] ready --- .gitignore | 1 + .idea/workspace.xml | 120 +++++++++++++++++--------------------------- .npmignore | 1 + package.json | 4 +- 4 files changed, 51 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index 56254b75e7..4f8561b586 100644 --- 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 index 94ec151dba..b51eb19ce2 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,62 +2,62 @@ - - - - - - - - - - - - - - + + + + - + - + - - - - - + + + - - + + - - - - + + - - + + + + + + + + + + + + + + + + - - - - + + - - - + + + - - + - + - + + + + @@ -73,33 +73,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -194,7 +168,7 @@ - + @@ -203,7 +177,7 @@ - + @@ -764,12 +738,12 @@ - + - @@ -1114,14 +1088,14 @@ - + - + diff --git a/.npmignore b/.npmignore index 56254b75e7..4f8561b586 100644 --- 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 index b33337e204..12c1ee7e67 100644 --- 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",