resolved conflicts

2026-08-19 02:12:23 +00:00 · 2018-06-13 14:29:28 -04:00 · 2018-06-13 14:29:28 -04:00 · c4063835bb
commit c4063835bb
parent 41494cbd0f d7afc81fb1
2 changed files with 2 additions and 0 deletions
--- a/shyft-cli/postgres_setup/create_tables.psql
+++ b/shyft-cli/postgres_setup/create_tables.psql
@ -38,3 +38,4 @@ CREATE TABLE IF NOT EXISTS accounts (
  balance numeric,
  txCountAccount numeric
 );
+shyft-cli/postgres_setup/create_tables.psql
--- a/shyft-cli/postgres_setup/drop_tables.psql
+++ b/shyft-cli/postgres_setup/drop_tables.psql
@ -1,3 +1,4 @@
 DROP TABLE txs;
 DROP TABLE blocks;
 DROP TABLE accounts;
+shyft-cli/postgres_setup/drop_tables.psql