Resolve conflicts

1 files changed, 12 insertions, 3 deletions

diff --git a/postgres/init.sql b/postgres/init.sql
index 922ce1ad..740063e7 100644
--- a/postgres/init.sql
+++ b/postgres/init.sql
@@ -4,7 +4,7 @@ CREATE DATABASE metricity;
 
 CREATE TABLE users (
     id varchar,
-    verified_at timestamp,
+    joined_at timestamp,
     primary key(id)
 );
 
@@ -16,15 +16,24 @@ INSERT INTO users VALUES (
 CREATE TABLE messages (
     id varchar,
     author_id varchar references users(id),
+    is_deleted boolean,
+    created_at timestamp,
+    channel_id varchar,
     primary key(id)
 );
 
 INSERT INTO messages VALUES(
     0,
-    0
+    0,
+    false,
+    now(),
+    '267659945086812160'
 );
 
 INSERT INTO messages VALUES(
     1,
-    0
+    0,
+    false,
+    now() + INTERVAL '10 minutes,',
+    '1234'
 );