update

wunci · Jul 13, 2017 · 81d95f4 · 81d95f4
2 parents 95796a8 + e2dd35b
commit 81d95f4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -21,16 +21,24 @@ use nodesql;
 
 > database: nodesql  tables: users posts comment  (已经在lib/mysql建表)
 
+<<<<<<< HEAD
  | users   | posts    |  comment  |
 | :----: | :----:   | :----: |
 | id        | id      |   id    |
 | name        | name      |   name    |
 | pass        | title      |   content    |
+=======
+| users   | posts    |  comment  |
+| :----: | :----:   | :----: |
+|   id    |   id    |   id    |
+|   name    |   name    |   name    |
+|   pass    |   title    |   content    |
+>>>>>>> e2dd35b80f0f9e40598b347ccbc727a980f6cceb
 |         | content      |   postid    |
 |         | uid      |       |
 |         | moment      |       |
 |         | comments      |       |
-|        | pv      |       |
+|        | pv      |       |      |
 
 * id主键递增
 * name: 用户名