A conflicting change.

d373d691 · Tim Pettersen · 389d4c10 · d373d691
Commit d373d691 authored Jan 21, 2015 by Tim Pettersen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

airfare.js airfare.js +1 -0

No files found.
--- a/airfare.js
+++ b/airfare.js
@@ -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;