From 8921671966e3f23c2d7cb5b806116fc553e3ec66 Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Sat, 5 Oct 2024 18:17:47 -0400 Subject: [PATCH] working output --- ...ce (conflicted copy 2024-10-05 141837).xml | 123 +++++++++ CMakeLists.txt | 2 +- include/a1.h | 79 +++--- lib/blt | 2 +- src/main.cpp | 257 +++++++++--------- 5 files changed, 291 insertions(+), 172 deletions(-) create mode 100644 .idea/workspace (conflicted copy 2024-10-05 141837).xml diff --git a/.idea/workspace (conflicted copy 2024-10-05 141837).xml b/.idea/workspace (conflicted copy 2024-10-05 141837).xml new file mode 100644 index 0000000..d0eaa7a --- /dev/null +++ b/.idea/workspace (conflicted copy 2024-10-05 141837).xml @@ -0,0 +1,123 @@ + + + + + { + "useNewFormat": true +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 5 +} + + + + { + "keyToString": { + "CMake Application.COSC-4P80-Assignment-1.executor": "Run", + "RunOnceActivity.ShowReadmeOnStart": "true", + "RunOnceActivity.cidr.known.project.marker": "true", + "RunOnceActivity.readMode.enableVisualFormatting": "true", + "cf.first.check.clang-format": "false", + "cidr.known.project.marker": "true", + "git-widget-placeholder": "main", + "last_opened_file_path": "/home/brett/Documents/code/c++/BLT_dev/BLT", + "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": "CPPToolchains", + "structure.view.defaults.are.configured": "true", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + + + + + + + + + + 1726720532743 + + + + + + + + + + + + +