remove git merge cruft

Signed-off-by: Jeff Billimek <[email protected]>
nextcloud · Aug 31, 2020 · e093fdb · e093fdb
1 parent 4a2e0a6
commit e093fdb
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 1,583 deletions.
diff --git a/.helmignore b/.helmignore
diff --git a/Chart.yaml b/Chart.yaml
diff --git a/OWNERS b/OWNERS
diff --git a/requirements.lock b/requirements.lock
diff --git a/requirements.yaml b/requirements.yaml
diff --git a/templates/NOTES.txt b/templates/NOTES.txt
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
diff --git a/templates/config.yaml b/templates/config.yaml