[RELEASE]: v0.3.3 (georgia-tech-db#984)

alexxx-db · Oct 3, 2023 · d562016 · d562016
1 parent cd39ae6
commit d562016
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### [Deprecated]
 ### [Removed]
 
+<<<<<<< HEAD
 ##  [0.3.6] - 2023-09-21
 
 * PR #1181: releass: bump a version further to skip cached wheel 
@@ -91,6 +92,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * PR #986: docs: Update README.md 
 * PR #983: doc: fix nav bar 
 
+=======
+>>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 ##  [0.3.3] - 2023-08-29
 
 * PR #983: doc: fix nav bar 

diff --git a/evadb/version.py b/evadb/version.py
@@ -1,6 +1,10 @@
 _MAJOR = "0"
 _MINOR = "3"
+<<<<<<< HEAD
 _REVISION = "7"
+=======
+_REVISION = "3"
+>>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 
 VERSION_SHORT = f"{_MAJOR}.{_MINOR}"
 VERSION = f"{_MAJOR}.{_MINOR}.{_REVISION}"