chore: update manifest

Signed-off-by: Frederico Araujo <[email protected]>
sysflow-telemetry · Apr 24, 2024 · 219706a · 219706a
1 parent 90e19a8
commit 219706a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/makefile.manifest.inc b/makefile.manifest.inc
@@ -6,11 +6,7 @@
 # Teryl Taylor <[email protected]>
 #
 
-<<<<<<< HEAD
-SYSFLOW_VERSION?=0.6.3
-=======
 SYSFLOW_VERSION?=0.7.0-rc1
->>>>>>> 1400413 (refactor: move otel exporter to exporter package)
 SYSFLOW_BUILD_NUMBER?=1
 SYSFLOW_JSON_SCHEMA_VERSION=5
 SYSFLOW_ECS_VERSION=8.2