On Dec 13, 2011, at 1:00 PM, [email protected] wrote: > Modified: geronimo/server/branches/3.0-beta/LICENSE > URL: > http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/LICENSE?rev=1213810&r1=1213809&r2=1213810&view=diff > ============================================================================== > --- geronimo/server/branches/3.0-beta/LICENSE (original) > +++ geronimo/server/branches/3.0-beta/LICENSE Tue Dec 13 18:00:08 2011 > @@ -744,6 +744,185 @@ The file in source code is also covered > > plugins/webservices/geronimo-webservices-builder/src/main/xsd/wsdl.xsd > > +<<<<<<< .working > +======= > +========================================================================= > +== Academic Free License 2.1 == > +========================================================================= > + > +The Academic Free License > +v. 2.1 > + > +This Academic Free License (the "License") applies to any original
This doesn't look like a very clean merge. The "<<< .working" is certainly incorrect. Some of the LICENSE changes don't look correct to me… --kevan
