Skip to content
This repository was archived by the owner on May 15, 2026. It is now read-only.

Commit df3e69e

Browse files
committed
Resolve merge conflicts
2 parents 21ae77e + d0e72b7 commit df3e69e

803 files changed

Lines changed: 44746 additions & 39598 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/changelog-config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const getReleaseLine = async (changeset) => {
2-
const [firstLine] = changeset.summary
2+
const lines = changeset.summary
33
.split("\n")
44
.map((l) => l.trim())
55
.filter(Boolean)
6-
return `- ${firstLine}`
6+
return lines.map((line) => (line.startsWith("- ") ? line : `- ${line}`)).join("\n")
77
}
88

99
const getDependencyReleaseLine = async () => {

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# These owners will be the default owners for everything in the repo
2-
* @mrubens @cte @jr
2+
* @mrubens @cte @jr @hannesrudolph @daniel-lxs

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Feature Request
4-
url: https://github.com/RooCodeInc/Roo-Code/discussions/categories/feature-requests
5-
about: Share and vote on feature requests for Roo Code
63
- name: Leave a Review
74
url: https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline&ssr=false#review-details
85
about: Enjoying Roo Code? Leave a review here!

0 commit comments

Comments
 (0)