Commit d373d691 authored by Tim Pettersen's avatar Tim Pettersen

A conflicting change.

parent 389d4c10
......@@ -5,6 +5,7 @@ var federalTransportTax = .025;
function calculateAirfare(baseFare) {
var fare = baseFare;
fare += customsFee; // This should conflict.
fare += immigrationFee;
fare *= (1 + federalTransportTax);
return fare;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment