Skip to content

Commit b97a116

Browse files
committed
Merge remote changes and resolve .gitignore conflict
- Keep agentic_v1/ ignore for archived code - Remove duplicate rust_rules.md entries - Preserve config.toml ignore
2 parents 3971760 + cce4988 commit b97a116

40 files changed

+1105
-5052
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/agentic_v1/
12
# Rust/Cargo
23
target/
34
**/target/
@@ -59,5 +60,3 @@ node_modules/
5960
/.env
6061
/.env.*
6162
config.toml
62-
ros_rules.md
63-
rust_rules.md

.idea/agentic.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 128 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)