diff options
| author | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
|---|---|---|
| committer | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
| commit | ac3f1e423e696392ea0a50c2652b829e5c5734b6 (patch) | |
| tree | b6ecb80019dae822619079ce34336d34a033f2df /CMakeLists.txt.user | |
| parent | f846ddba00aee29675f0bd4f5dbc87a94a422368 (diff) | |
| parent | 14684344d553dee4b3cc252709716bff927e85b8 (diff) | |
resolve merge conflicts and attempt to fix local paths
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> |