Skip to content

Commit

Permalink
Fix a git merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
kispaljr committed May 31, 2024
1 parent a8f2454 commit 3be7481
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions test/e2e/cli/testdata/rpkg-init/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ commands:
- --output=custom-columns=NAME:.metadata.name,ADDRESS:.spec.git.repo,BRANCH:.spec.git.branch,DIR:.spec.git.directory
stdout: |
NAME ADDRESS BRANCH DIR
git http://git-server.test-git-namespace.svc.cluster.local:8080/rpkg-init main /
ignoreWhitespace: true
git http://git-server.test-git-namespace.svc.cluster.local:8080/rpkg-init main /
- args:
- porchctl
- rpkg
Expand Down

0 comments on commit 3be7481

Please sign in to comment.