Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeshingles committed Apr 26, 2024
2 parents f864f3f + d1eec12 commit aef847c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"configurations": [
{
"name": "C/C++: clang++ build and debug active file",
"type": "cppdbg",
"request": "launch",
"program": "${fileDirname}/${fileBasenameNoExtension}",
"args": [],
"stopAtEntry": false,
"cwd": "${fileDirname}",
"environment": [],
"externalConsole": false,
"MIMode": "lldb",
"preLaunchTask": "C/C++: clang++ build active file"
}
],
"version": "2.0.0"
}
2 changes: 1 addition & 1 deletion artisoptions_nltenebular.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@ constexpr bool EXPANSION_OPAC_SAMPLE_KAPPAPLANCK = false;
constexpr bool USE_XCOM_GAMMAPHOTOION = false;

// NOLINTEND(modernize*,misc-unused-parameters)
#endif // ARTISOPTIONS_H
#endif // ARTISOPTIONS_H

0 comments on commit aef847c

Please sign in to comment.