-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Soundcloud #50
base: master
Are you sure you want to change the base?
Soundcloud #50
Conversation
Conflicts: Gemfile.lock Procfile
@@ -250,7 +250,7 @@ GEM | |||
temple (~> 0.4.1) | |||
tilt (~> 1.3.3) | |||
slop (2.4.4) | |||
springboard (0.18.7.1) | |||
springboard (0.19.9) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Get rid of the changes in this file: git checkout master Gemfile.lock
Some Git tips… You can avoid accidental additions to files by using Also, if you find you have several changes in a row that are ostensibly the same thing on a branch, like removing different accidentally added files, you can use |
Oh add -p, killer. That will definitely be handy. Thanks for all the help you two and Archit have given this week. Its been really fun, actually. Excited to get my hands dirtier... |
It works, including previews.
Should consider rewriting using the soundcloud gem: https://github.com/soundcloud/ruby-api-wrapper/wiki