Merge branch 'master' into fs_external_dlcupdates

# Conflicts: # src/android/app/src/main/jni/native.cpp
7 days ago · 3f0c9534b5
1 changed files with 1 additions and 1 deletions
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -57,8 +57,8 @@
 #include "core/file_sys/content_archive.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/fs_filesystem.h"
-#include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/romfs.h"
+#include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/romfs.h"
 #include "core/file_sys/submission_package.h"
 #include "core/file_sys/vfs/vfs.h"