cleanup directory

2025-05-30 16:45:39 +10:00
parent ae96075275
commit ce24a011ed
1 changed files with 0 additions and 7 deletions
@@ -3,13 +3,6 @@ __pycache__
 .venv
 .aider*
 .vscode
-<<<<<<< HEAD
-<<<<<<< HEAD
 .zed
 pyproject.toml
 .ropeproject
-=======
->>>>>>> e1a24af (get rid of think tags)
-=======
-generated_files/*
->>>>>>> d45f0be (env set up for remote)