Finish resolving merge conflicts

2023-03-23 20:33:23 -06:00 · 2023-03-23 20:33:23 -06:00 · c43875af96
commit c43875af96
parent 49bf1126c7
1 changed files with 1 additions and 0 deletions
--- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
+++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
@ -568,6 +568,7 @@ public class BarrowmanCalculatorTest {
 		testTube.setCDOverridden(false);
 		testForces = calc.getAerodynamicForces(testConfig, testConditions, warnings);
 		assertEquals("base CD should be base CD of tube", tubeBaseCD, testForces.getBaseCD(), EPSILON);
+	}

 	/**
 	 * Tests railbutton drag.  Really is testing instancing more than actual drag calculations, and making