From 5a7099cce1ac0b28e68700d48764e2586949b303 Mon Sep 17 00:00:00 2001
From: Caroline Moore <calobee@gmail.com>
Date: Wed, 12 Jun 2024 12:12:45 -0400
Subject: [PATCH] Fixup project versions

---
 projects/packages/connection/src/class-package-version.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php
index 95597c02c493e..c3948b34c2b55 100644
--- 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';