Fixup project versions

Automattic · Jun 12, 2024 · 5a7099c · 5a7099c
1 parent ddd793d
commit 5a7099c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
@@ -12,11 +12,7 @@
  */
 class Package_Version {
 
-<<<<<<< add/blog-id-to-tracks-events
 	const PACKAGE_VERSION = '2.11.0-alpha';
-=======
-	const PACKAGE_VERSION = '2.10.1';
->>>>>>> trunk
 
 	const PACKAGE_SLUG = 'connection';