Merge branch 'dev' of github.com:mastodon-sc/mastodon into dev

tinevez · tinevez · commit 7b6ee7e6062a · 2022-11-04T12:18:20.000+01:00
diff --git a/src/test/java/org/mastodon/StartImageJ.java b/src/test/java/org/mastodon/StartImageJ.java
@@ -38,6 +38,7 @@
  */
 public class StartImageJ
 {
+
 	public static void main( final String... args )
 	{
 		@SuppressWarnings( "resource" )
diff --git a/src/test/java/org/mastodon/StartMastodonLauncher.java b/src/test/java/org/mastodon/StartMastodonLauncher.java
@@ -40,6 +40,7 @@
  */
 public class StartMastodonLauncher
 {
+
 	public static void main( final String... args )
 	{
 		@SuppressWarnings( "resource" )

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`*/`
`39`	`39`	`public class StartImageJ`
`40`	`40`	`{`
	`41`	`+`
`41`	`42`	`public static void main( final String... args )`
`42`	`43`	`{`
`43`	`44`	`@SuppressWarnings( "resource" )`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`*/`
`41`	`41`	`public class StartMastodonLauncher`
`42`	`42`	`{`
	`43`	`+`
`43`	`44`	`public static void main( final String... args )`
`44`	`45`	`{`
`45`	`46`	`@SuppressWarnings( "resource" )`