Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: dejanualex <[email protected]>
  • Loading branch information
dejanu committed Jul 14, 2024
1 parent a4a837f commit fbd105a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,5 @@ and we will add you. **All** contributors belong here. 💯
- [Shivam](https://github.com/Bharadwajshivam28)
- [David Gannon](https://github.com/dgannon991)
- [guangwu guo](https://github.com/testwill)
- [Eric Herrmann](https://github.com/egherrmann)
- [Alex Dejanu](https://github.com/dejanu)
2 changes: 1 addition & 1 deletion docs/content/docs/quickstart/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ History:
To upgrade the resources managed by the bundle, use `porter upgrade`.

```bash
porter upgrade
porter upgrade porter-hello
```

```
Expand Down

0 comments on commit fbd105a

Please sign in to comment.