merging in from 15.x

matsim-org · Jan 21, 2023 · d5e256a · d5e256a
2 parents 9189573 + f67d6d0
commit d5e256a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/output/.gitignore b/output/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/...a/org/matsim/codeexamples/programming/demandGenerationWithFacilities/IntegrationTest.java b/...a/org/matsim/codeexamples/programming/demandGenerationWithFacilities/IntegrationTest.java
@@ -34,7 +34,6 @@ public class IntegrationTest {
 
 	@Rule public MatsimTestUtils utils = new MatsimTestUtils() ;
 
-	@SuppressWarnings("static-method")
 	@Test
 	public final void test() {