diff --git a/PcgsInvUi/App.axaml.cs b/PcgsInvUi/App.axaml.cs index 4ea4e4f..c5de0f4 100644 --- a/PcgsInvUi/App.axaml.cs +++ b/PcgsInvUi/App.axaml.cs @@ -17,11 +17,7 @@ public partial class App : Application { if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) { var coins = new CoinDatabase(); desktop.MainWindow = new MainWindow { -<<<<<<< HEAD - DataContext = new MainWindowViewModel(coins, true), -======= DataContext = new MainWindowViewModel(coins, !coins.TryInitApiClient()), ->>>>>>> 4b2504b48ca36e20013134202175b826584eab21 }; // Allow the application to save the database when it exits. diff --git a/makefile b/makefile new file mode 100644 index 0000000..7d8b7e6 --- /dev/null +++ b/makefile @@ -0,0 +1,5 @@ +build: + dotnet build .\PcgsInvUi\PcgsInvUi.csproj + +run: + dotnet run --project .\PcgsInvUi\PcgsInvUi.csproj