ttt-ce/.vscode/settings.json
MikolajG 24bf13666f Merge branch 'dev-kinematic' of ssh://git@129.151.217.187:23/MikolajG/ttt-ce.git into dev-kinematic
# Conflicts:
#    .vscode/settings.json
#    src/player_utils/character_controller.rs
2024-07-11 14:12:11 +02:00

13 lines
No EOL
285 B
JSON

{
"cSpell.words": [
"Gamepad",
"qeury",
"Substep",
"xpbd"
],
<<<<<<< HEAD
"rust-analyzer.checkOnSave": false
=======
"rust-analyzer.checkOnSave": false,
>>>>>>> branch 'dev-kinematic' of ssh://git@129.151.217.187:23/MikolajG/ttt-ce.git
}