diff --git a/1. **`timmy-config/.gitea/protected_branches.yaml` b/1. **`timmy-config/.gitea/protected_branches.yaml` deleted file mode 100644 index b8ee1dd6..00000000 --- a/1. **`timmy-config/.gitea/protected_branches.yaml` +++ /dev/null @@ -1,15 +0,0 @@ -main: - require_pull_request: true - required_approvals: 1 - dismiss_stale_approvals: true - # require_ci_to_merge: true (limited CI) - block_force_push: true - block_deletions: true ->>>>>>> replace -``` - ---- - -### 2. **`timmy-config/CODEOWNERS`** -```txt -<<<<<<< search