/**
 *  Copyright 2007-2013 University Of Southern California
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing,
 *  software distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
package edu.isi.pegasus.planner.test;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;

@RunWith(Suite.class)
@Suite.SuiteClasses({
    edu.isi.pegasus.common.util.VersionTest.class,
    edu.isi.pegasus.common.util.PegasusURLTest.class,
    edu.isi.pegasus.planner.transfer.mapper.FlatOutputMapperTest.class,
    edu.isi.pegasus.planner.transfer.mapper.HashedOutputMapperTest.class,
    edu.isi.pegasus.planner.transfer.mapper.ReplicaOutputMapperTest.class
})
>>>>>>> Update build process
public class AllTests {
}


/**
 *  Copyright 2007-2013 University Of Southern California
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 *  Unless required by applicable law or agreed to in writing,
 *  software distributed under the License is distributed on an "AS IS" BASIS,
 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 */
package edu.isi.pegasus.planner.test;

import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;

@RunWith(Suite.class)
@Suite.SuiteClasses({
    edu.isi.pegasus.common.util.VersionTest.class,
    edu.isi.pegasus.common.util.PegasusURLTest.class,
    edu.isi.pegasus.planner.transfer.mapper.FlatOutputMapperTest.class,
    edu.isi.pegasus.planner.transfer.mapper.HashedOutputMapperTest.class,
    edu.isi.pegasus.planner.transfer.mapper.ReplicaOutputMapperTest.class
})
public class AllTests {
}


Fix my merge mistake