Skip to content


Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed conflict

  • Loading branch information...
commit 8c0d06276f6dd8f8e78b9e2a82ec8eacc78a4ba4 2 parents 3383d95 + 2c9e9ae
@EricR authored
Showing with 20 additions and 11 deletions.
  1. +16 −11 .gitignore
  2. +4 −0
27 .gitignore
@@ -1,15 +1,20 @@
-# See for more about ignoring files.
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-# git config --global core.excludesfile ~/.gitignore_global
-# Ignore bundler config
-# Ignore the default SQLite database.
-# Ignore all logfiles and tempfiles.
@@ -0,0 +1,4 @@
+A sample Rails app that allows you to authenticate with Facebook via OAuth and choose a friend of yours.
Please sign in to comment.
Something went wrong with that request. Please try again.