Revert "merge with main"

This reverts commit 7c74f16, reversing changes made to 74563bb.
codefresh-io · Jul 14, 2024 · ab349d9 · ab349d9
1 parent b6ecb70
commit ab349d9
Show file tree

Hide file tree

Showing 59 changed files with 1,457 additions and 7,988 deletions.
diff --git a/.codefresh/codefresh.yaml b/.codefresh/codefresh.yaml
diff --git a/.eslintrc.yml b/.eslintrc.yml
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,6 @@ telepresence.log
 venonactl/dist/*
 venonactl-linux
 venonalog.json
-<<<<<<< HEAD
 .venonaconf
 .cover
 configdir
@@ -49,6 +48,4 @@ venona/venona
 **/cover
 
 # debug
-**/debug
-=======
->>>>>>> master
+**/debug