diff --git a/.gitignore (conflicted copy 2024-04-01 082422) b/.gitignore (conflicted copy 2024-04-01 082422) deleted file mode 100644 index e28c4f5..0000000 --- a/.gitignore (conflicted copy 2024-04-01 082422) +++ /dev/null @@ -1,2 +0,0 @@ -build/ -cmake-build-*/ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7537d3b..ecab4ac 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -284,7 +284,7 @@ - - { - "keyToString": { - "CMake Application.Assignment_1.executor": "Run", - "CMake Application.Assignment_1_RUNNER.executor": "Run", - "CMake Application.FinalProject.executor": "Run", - "CMake Application.FinalProject_Runner.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.cidr.known.project.marker": "true", - "RunOnceActivity.readMode.enableVisualFormatting": "true", - "cf.advertisement.text.has.clang-format": "true", - "cf.first.check.clang-format": "false", - "cidr.known.project.marker": "true", - "git-widget-placeholder": "main", - "last_opened_file_path": "/home/brett/Documents/Brock/CS 4P82/Final Project/FP-C-Project", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.sourceCode.C/C++", - "structure.view.defaults.are.configured": "true", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -341,6 +341,11 @@ + + + +