Merge remote-tracking branch 'origin/master'

Castau · Castau · commit 07db245e60ff · 2019-04-26T15:19:51.000+02:00
diff --git a/FogCarport/src/main/java/logic/PartslistLogic.java b/FogCarport/src/main/java/logic/PartslistLogic.java
@@ -67,7 +67,6 @@ PartslistModel getSimpleBOM(String height, String length, String width, String s
             hasShed = true;
         }
         // If input is out of bounds, then throw an error. 
-        // Units in mm
         if (_height < 2000 || _height > 3000 || _length < 2400 || _length > 7200 || _width < 2400 || _width > 7200)
         {
             // Should maybe be something like a ShopException.

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ PartslistModel getSimpleBOM(String height, String length, String width, String s`
`67`	`67`	`hasShed = true;`
`68`	`68`	`}`
`69`	`69`	`// If input is out of bounds, then throw an error.`
`70`		`- // Units in mm`
`71`	`70`	`if (_height < 2000 \|\| _height > 3000 \|\| _length < 2400 \|\| _length > 7200 \|\| _width < 2400 \|\| _width > 7200)`
`72`	`71`	`{`
`73`	`72`	`// Should maybe be something like a ShopException.`