Skip to content

Commit

Permalink
chore: conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Cameron Meissner committed Feb 19, 2025
2 parents f18ed87 + b38932e commit 2ce6dba
Show file tree
Hide file tree
Showing 3,952 changed files with 1,779,863 additions and 70,508 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
{
"name": "Go",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/go:1-1.20-bullseye",
"image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye",
"features": {
"ghcr.io/devcontainers-contrib/features/protoc:1": {}
"ghcr.io/devcontainers-contrib/features/protoc:1": {},
"ghcr.io/devcontainers/features/azure-cli:1": {}
},

// Features to add to the dev container. More info: https://containers.dev/features.
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ about: Create a report to help us improve this project
**Anything else we need to know?**:

**Environment**:

- AgentBaker version:
- Kubernetes version (use `kubectl version`):
- OS (e.g. from /etc/os-release):
Expand Down
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ _If PR is about `failing-tests or flakes`, please post the related issues/tests
Fixes #

**Requirements**:

- [ ] uses [conventional commit messages](https://www.conventionalcommits.org/)
<!-- Common commit types:
build: Build 🏭
Expand All @@ -48,8 +49,8 @@ Fixes #

**Special notes for your reviewer**:


**Release note**:

```
none
```
435 changes: 435 additions & 0 deletions .github/README-RENOVATE.md

Large diffs are not rendered by default.

Binary file added .github/images/JSONata_exerciser_example.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/images/Renovate_component_datasource.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/images/Renovate_minor_enabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2ce6dba

Please sign in to comment.