Conflicts resolved

ClusterM · Sep 17, 2023 · 51a8dde · 51a8dde · Cuculcos000 · Sep 18, 2023
2 parents 7434a05 + bca1206
commit 51a8dde
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -33,7 +33,7 @@ jobs:
       APP_NAME: nestiler
       PROJECT_PATH: ./NesTiler
       OUTPUT_DIR: output
-      CONFIGURATION: Debug
+      CONFIGURATION: Interim
       OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
       OUTPUT_FILE: nestiler-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.sc == 'self-contained' && '-self-contained' || '' }}.${{ matrix.os == 'win' && 'zip' || 'tar.gz' }}
     steps:

diff --git a/NesTiler/Program.cs b/NesTiler/Program.cs
@@ -27,7 +27,7 @@ static void PrintAppInfo()
 #if !INTERIM
                 $"v{versionStr}"
 #else
-                "intrerim version"
+                 "interim version"
 #endif
 #if DEBUG
                 + " (debug)"

diff --git a/README.md b/README.md
@@ -234,7 +234,7 @@ Examples:
 ## Download
 You can always download latest version at [https://github.com/ClusterM/NesTiler/releases](https://github.com/ClusterM/NesTiler/releases).
 
-Also, you can download automatic nightly builds: [http://clusterm.github.io/NesTiler/](http://clusterm.github.io/NesTiler/).
+Also, you can download automatic interim builds: [http://clusterm.github.io/NesTiler/](http://clusterm.github.io/NesTiler/).
 
 ## Donate
 * [Donation Alerts](https://www.donationalerts.com/r/clustermeerkat)