Ok, thanks for checking.  I don't exactly know what Git did but I'll fix it in a couple hours.

-Jesse

On Jul 27, 2013, at 11:44 AM, ejohnson44 <notifications@github.com> wrote:

> In SoundStream/src/com/lastcrusade/soundstream/util/Transitions.java:
> 
> > @@ -51,8 +50,6 @@
> >      //Home is where you get sent after connecting to the network
> >      private final static int HOME = MUSIC_LIBRARY;
> >      
> > -    public final static String currentContent = "currentContent";
> This isn't right. Somehow you're trying to overwrite all of the changes to transitions that I made, so if you know how to just take this file out of the pull request, you should do that because none of these changes should go through
> 
> —
> Reply to this email directly or view it on GitHub.
>