seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fixed merge conflict

This commit is contained in:
Jonathan Kolyer 2014-01-08 21:32:23 -06:00
parent e5d23cc3bd
commit c576901d0d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruby/lib/jam_ruby.rb
View File

@ -85,9 +85,7 @@ require "jam_ruby/models/mix"
require "jam_ruby/models/claimed_recording"
require "jam_ruby/models/crash_dump"
require "jam_ruby/models/isp_score_batch"
<<<<<<< HEAD
require "jam_ruby/models/promotional"
=======
require "jam_ruby/models/icecast_admin_authentication"
require "jam_ruby/models/icecast_directory"
require "jam_ruby/models/icecast_limit"
@ -101,7 +99,6 @@ require "jam_ruby/models/icecast_sercurity"
require "jam_ruby/models/icecast_server"
require "jam_ruby/models/icecast_servermisc"
require "jam_ruby/models/icecast_user_authentication"
>>>>>>> develop
include Jampb