Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/BUTR/Bannerlord.BLSE into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Bannerlord.LauncherEx/PrefabExtensions/UILauncherPrefabExtension.ImportExport.cs
#	src/Bannerlord.LauncherEx/PrefabExtensions/UILauncherPrefabExtension.Minor.cs
#	src/Bannerlord.LauncherEx/PrefabExtensions/UILauncherPrefabExtension.Mods.Saves.cs
#	src/Bannerlord.LauncherEx/PrefabExtensions/UILauncherPrefabExtension.Mods.cs
#	src/Bannerlord.LauncherEx/PrefabExtensions/UILauncherPrefabExtension.Options.cs
#	src/Bannerlord.LauncherEx/ViewModels/BUTRLauncherModuleVM.cs
  • Loading branch information
Aragas committed Apr 17, 2024
2 parents 15fba97 + 86831dd commit 9333879
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9333879

Please sign in to comment.