From bc16590380b5f588670f8ecb3d3bdb41e84a9088 Mon Sep 17 00:00:00 2001 From: Connor Mclean Date: Thu, 21 Jun 2018 15:19:31 +0200 Subject: [PATCH 1/2] comment change for devs --- EasyMock/src/com/nirman/easymock/Retailer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EasyMock/src/com/nirman/easymock/Retailer.java b/EasyMock/src/com/nirman/easymock/Retailer.java index ef001ef..6103efc 100644 --- a/EasyMock/src/com/nirman/easymock/Retailer.java +++ b/EasyMock/src/com/nirman/easymock/Retailer.java @@ -18,6 +18,8 @@ public int getPriceForProduct(String productId) throws Exception { return price; } + // this is a change for all devs + private int getPrice(int basePrice) { int finalPrice = basePrice + ((basePrice * getTaxRate()) / 100); return finalPrice; From fceeb02ca883ff8fdb4bd1c53d606a36c52d5910 Mon Sep 17 00:00:00 2001 From: Connor Mclean Date: Thu, 21 Jun 2018 15:26:22 +0200 Subject: [PATCH 2/2] commit only --- EasyMock/src/com/nirman/easymock/Retailer.java | 4 ++++ JavaPowershell/.gitignore | 1 + 2 files changed, 5 insertions(+) create mode 100644 JavaPowershell/.gitignore diff --git a/EasyMock/src/com/nirman/easymock/Retailer.java b/EasyMock/src/com/nirman/easymock/Retailer.java index 6103efc..cbec343 100644 --- a/EasyMock/src/com/nirman/easymock/Retailer.java +++ b/EasyMock/src/com/nirman/easymock/Retailer.java @@ -28,4 +28,8 @@ private int getPrice(int basePrice) { public int getTaxRate() { return taxes_in_percent; } + + public String myTaxRate() { + return "50%"; + } } diff --git a/JavaPowershell/.gitignore b/JavaPowershell/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/JavaPowershell/.gitignore @@ -0,0 +1 @@ +/bin/