diff options
Diffstat (limited to 'CMakeLists.txt.user')
| -rw-r--r-- | CMakeLists.txt.user | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 758ed22..077c2df 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> +<<<<<<< HEAD <!-- Written by QtCreator 8.0.1, 2024-05-07T03:41:57. --> +======= +<!-- Written by QtCreator 8.0.1, 2024-05-07T05:26:10. --> +>>>>>>> let-em-cook <qtcreator> <data> <variable>EnvironmentId</variable> |