add link to next section/task to be done in the MVP dwyl/app#234

dwyl · Nov 13, 2019 · 8d55476 · 8d55476
2 parents 23f0cdf + 8e3783e
commit 8d55476
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -462,11 +462,16 @@ end
 ```
 
 Now run the `mix ecto.migrate` script.
+The Entity Relationship Diagram (ERD)
+should now look like this:
 
+![app-er-diagram-with-item_tags](https://user-images.githubusercontent.com/194400/68804955-c62eca80-065a-11ea-888b-9391154aceda.png)
 
 
+# _Next_
 
-
+Build the basic _capture_ stage:
+https://github.com/dwyl/app/issues/234
 
 
 <br /><br />

diff --git a/priv/repo/migrations/20191113195733_create_item_tags_association.exs b/priv/repo/migrations/20191113195733_create_item_tags_association.exs
@@ -4,7 +4,11 @@ defmodule App.Repo.Migrations.CreateItemTagsAssociation do
   def change do
     create table(:item_tags) do
       add :item_id, references(:items)
+<<<<<<< HEAD
       add :tag_id, references(:tags)
+=======
+      add :Tag_id, references(:tags)
+>>>>>>> 8e3783e8f63177cbc789b7ed9094165e646b50d8
 
       timestamps()
     end