Skip to content

Instantly share code, notes, and snippets.

@solars

solars/gist:5ede4213eb112cb15397 Secret

Created July 28, 2014 11:05
Show Gist options
  • Save solars/5ede4213eb112cb15397 to your computer and use it in GitHub Desktop.
Save solars/5ede4213eb112cb15397 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Updating https://svn.seekda.com/widgets/trunk/delivery revision: Jul 28, 2014 12:50:09 PM depth:infinity ignoreExternals: false
C Gemfile.lock
C webrat.log
U lib/amqp_publisher.rb
U Gemfile
At revision 5860
[workspace] $ /bin/bash --login -e /tmp/hudson7188161731383372582.sh
Using /home/hudson/.rvm/gems/ruby-1.9.3-p448 with gemset widget-delivery
Your Gemfile.lock contains merge conflicts.
Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment