Trip.java

<<<<<<< HEAD
package simulation;

/**
 * Class representing a trip
 *
 */
public class Trip extends SUMOInstruction {

	public Trip(int departureTime, String xmlDefinition) {
		super(departureTime, xmlDefinition);
	}
}
=======
package simulation;

/**
 * Class representing a trip
 *
 */
public class Trip extends SUMOInstruction {

	public Trip(int departureTime, String xmlDefinition) {
		super(departureTime, xmlDefinition);
	}
}
>>>>>>> origin/abdalla