fixing heroku deployment error

app/assets/stylesheets/application.css

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree . 
-*/

config/routes.rb

@@ -1,10 +1,9 @@
 SampleApp::Application.routes.draw do
-<<<<<<< HEAD
+
   resources :users
 
-=======
   get "users/new"
->>>>>>> 214cc4f6c49b2b2a2b5ce2aaa986f67f8930a8c0
+
 
   match '/signup/', :to => 'users#new'
 

public/assets/manifest.yml

@@ -0,0 +1,24 @@
+--- 
+plugins/link-icons/readme.txt: plugins/link-icons/readme-42c02030199cd36a671d4b623cb4dc36.txt
+plugins/link-icons/icons/pdf.png: plugins/link-icons/icons/pdf-c4c543e5103a8516839a7846b91e1ac4.png
+plugins/link-icons/icons/lock.png: plugins/link-icons/icons/lock-d73c4b3b57ce72cb6dbd8b265507ff75.png
+plugins/link-icons/icons/external.png: plugins/link-icons/icons/external-ee6d976ddb80125fafe1a33c6f8aed10.png
+plugins/link-icons/icons/email.png: plugins/link-icons/icons/email-28104e72b3418737d4b9b329c12ec358.png
+jquery.min.js: jquery-8a50feed8d29566738ad005e19fe1c2d.min.js
+src/grid.png: src/grid-973add038ed86febca85f03e8b35b94a.png
+plugins/link-icons/icons/visited.png: plugins/link-icons/icons/visited-fb2370448bc4ea5d079e963a8c0d900b.png
+plugins/buttons/icons/tick.png: plugins/buttons/icons/tick-3f5fc1f52b505b93f88263e0432d25ce.png
+plugins/buttons/icons/cross.png: plugins/buttons/icons/cross-2ebcd25368006d1b7b0c5b7d6b523ab3.png
+plugins/link-icons/icons/xls.png: plugins/link-icons/icons/xls-5399729cd31dffc492a04b3805cd0be1.png
+plugins/link-icons/icons/im.png: plugins/link-icons/icons/im-afeeb6e0b652c1edb1441bf0fb428596.png
+plugins/buttons/readme.txt: plugins/buttons/readme-3ff7f5dbb0288d71f70682fdbe9d86ec.txt
+jquery-ui.min.js: jquery-ui-7e33882a28fc84ad0e0e47e46cbf901c.min.js
+rails.png: rails-bd9ad5a560b5a3a7be0808c5cd76a798.png
+application.css: application-ccb8034635849c44627859332fda6a01.css
+plugins/link-icons/icons/doc.png: plugins/link-icons/icons/doc-b071fd74b88ff38cda8360a53f493013.png
+plugins/rtl/readme.txt: plugins/rtl/readme-8d11bf76e19fb3fc7dbc6c2ddb54b92d.txt
+logo.png: logo-8e0a5ad292fbb13a2b07e68fa3995406.png
+application.js: application-38fd292438fd50052a4a5b81204dc6fb.js
+plugins/link-icons/icons/feed.png: plugins/link-icons/icons/feed-59bc8604661681639d25cb7015a32c38.png
+plugins/fancy-type/readme.txt: plugins/fancy-type/readme-e7ed185d1a9f23256d418ab929b464d9.txt
+plugins/buttons/icons/key.png: plugins/buttons/icons/key-55237526967cbcab3e8cfb12f0029d88.png

public/assets/plugins/buttons/readme-3ff7f5dbb0288d71f70682fdbe9d86ec.txt

@@ -0,0 +1,32 @@
+Buttons
+
+* Gives you great looking CSS buttons, for both <a> and <button>.
+* Demo: particletree.com/features/rediscovering-the-button-element
+
+
+Credits
+----------------------------------------------------------------
+
+* Created by Kevin Hale [particletree.com]
+* Adapted for Blueprint by Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.
+
+2) Use the following HTML code to place the buttons on your site:
+
+  <button type="submit" class="button positive">
+    <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Save
+  </button>
+
+  <a class="button" href="/password/reset/">
+    <img src="css/blueprint/plugins/buttons/icons/key.png" alt=""/> Change Password
+  </a>
+
+  <a href="#" class="button negative">
+    <img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
+  </a>

public/assets/plugins/fancy-type/readme-e7ed185d1a9f23256d418ab929b464d9.txt

@@ -0,0 +1,14 @@
+Fancy Type
+
+* Gives you classes to use if you'd like some 
+  extra fancy typography. 
+
+Credits and instructions are specified above each class
+in the fancy-type.css file in this directory.
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.

public/assets/plugins/link-icons/readme-42c02030199cd36a671d4b623cb4dc36.txt

@@ -0,0 +1,18 @@
+Link Icons
+* Icons for links based on protocol or file type.
+
+This is not supported in IE versions < 7.
+
+
+Credits
+----------------------------------------------------------------
+
+* Marc Morgan
+* Olav Bjorkoy  [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+  <link rel="stylesheet" href="css/blueprint/plugins/link-icons/screen.css" type="text/css" media="screen, projection">

public/assets/plugins/rtl/readme-8d11bf76e19fb3fc7dbc6c2ddb54b92d.txt

@@ -0,0 +1,10 @@
+RTL
+* Mirrors Blueprint, so it can be used with Right-to-Left languages.
+
+By Ran Yaniv Hartstein, ranh.co.il
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+   <link rel="stylesheet" href="css/blueprint/plugins/rtl/screen.css" type="text/css" media="screen, projection">