Merge pull request #68 from coreydaley/master

Fixing extended test failures by:
sclorg · Nov 9, 2016 · 26b5a51 · 26b5a51
2 parents afc0746 + 5a13652
commit 26b5a51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
@@ -1,2 +1,2 @@
-<h1>Welcome#index</h1>
-<p>Find me in app/views/welcome/index.html.erb</p>
+<h1>Hello, Rails!</h1>
+<%= link_to 'My Blog', controller: 'articles' %>
diff --git a/config/database.yml b/config/database.yml
@@ -18,8 +18,7 @@ default: &default
 
 development:
   <<: *default
-  adapter: sqlite3
-  database: db/development.sqlite3
+
 test:
   adapter: sqlite3
   database: db/test.sqlite3