Skip to content

Commit 576e651

Browse files
committed
docs: remove leftover conflict marker from helm-chart-values
1 parent 8ac3922 commit 576e651

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

docs/kthena/docs/reference/helm-chart-values.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# kthena
1+
4# kthena
22

33
A Helm chart for deploying Kthena
44

55
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
66

7-
>>>>>>> b9eb97a (Fix router controllers to handle delete tombstones correctly)
87
## Values
98

109
| Key | Type | Default | Description |

0 commit comments

Comments
 (0)