Resolve Conflicts

yaRnMcDonuts · web-flow · commit 5f779cf0e983 · 2025-07-29T12:37:28.000-04:00
diff --git a/jme3-core/src/main/java/com/jme3/system/AppSettings.java b/jme3-core/src/main/java/com/jme3/system/AppSettings.java
@@ -1588,6 +1588,7 @@ public static void printPreferences(String preferencesKey) throws BackingStoreEx
             }
             logger.log(Level.INFO, sb.toString());
         }
+    }
     /**
      * Sets the preferred native platform for creating the GL context on Linux distributions.
      * <p>

Original file line number	Diff line number	Diff line change
`@@ -1588,6 +1588,7 @@ public static void printPreferences(String preferencesKey) throws BackingStoreEx`
`1588`	`1588`	`}`
`1589`	`1589`	`logger.log(Level.INFO, sb.toString());`
`1590`	`1590`	`}`
	`1591`	`+ }`
`1591`	`1592`	`/**`
`1592`	`1593`	`* Sets the preferred native platform for creating the GL context on Linux distributions.`
`1593`	`1594`	`* <p>`