Resolving merge conflicts.

This commit is contained in:
BDisp
2023-03-17 11:24:53 +00:00
51 changed files with 301 additions and 157 deletions

View File

@@ -18,7 +18,7 @@ NOTE: This is the WORK IN PROGRESS `v2.x` branch. The `main` branch is the stabl
Paste these commands into your favorite terminal on Windows, Mac, or Linux. This will install the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates), create a new "Hello World" TUI app, and run it.
(Press `CTRL-Q` to exit the app)
(Press `CTRL-Q` to quit the app)
```powershell
dotnet new --install Terminal.Gui.templates
@@ -82,7 +82,7 @@ public class ExampleWindow : Window {
public ExampleWindow ()
{
Title = "Example App (Ctrl+Q to quit)";
Title = $"Example App ({Application.QuitKey} to quit)";
// Create input components and labels
var usernameLabel = new Label () {