Merge pull request #8 from danilosnDesk/gemfile-conflit-fix

Gemfile conflit fix
pusher · Nov 21, 2024 · 34c01ca · 34c01ca
2 parents 3bafcd3 + 455c300
commit 34c01ca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.DS_Store
-config.yml
+Gemfile.lock
+config.yml
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ restyle your web template to look awesome. "index.erb"
 
 ### How to run locally
 * `bundle install`
+* `cp config.example.yml config.yml`
 * `ruby app.rb`
 
 Open your web browser at *http://localhost:4566*.