merge problem



On Thu, Dec 19, 2013 at 9:47 PM, Joseph Wu <notifications@github.com> wrote:

> In
> tools/tool-migration-utility/src/main/java/org/sagebionetworks/tool/migration/v3/StubSynapseAdministration.java:
>
> > @@ -0,0 +1,2700 @@
> > +package org.sagebionetworks.tool.migration.v3;
>
> Why is this file reappearing? It should have been removed.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/Sage-Bionetworks/Synapse-Repository-Services/pull/946/files#r8493362>
> .
>



-- 
John Hill
Principal Software Engineer
Sage Bionetworks
1100 Fairview Ave N, M1-C117
Seattle, WA  98109

john.hill@sagebase.org
office: 206.667.1160
mobile: 206.335.1798
http://www.sagebase.org