From 83c61e8d50e4b0a3b469ac9b731a331fc8e57529 Mon Sep 17 00:00:00 2001
From: Andrew Omondi <anomondi@microsoft.com>
Date: Wed, 13 Nov 2024 16:17:06 +0300
Subject: [PATCH] cleanup merge conflicts

---
 CHANGELOG.md          | 2 +-
 Directory.Build.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79b66ee..bf5fd68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.14.1] - 2024-11-13
+## [1.15.1] - 2024-11-13
 
 ### Added
 
diff --git a/Directory.Build.props b/Directory.Build.props
index a0dfeef..66c849b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <!-- Common default project properties for ALL projects-->
   <PropertyGroup>
-    <VersionPrefix>1.14.0</VersionPrefix>
+    <VersionPrefix>1.15.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <!-- This is overidden in test projects by setting to true-->
     <IsTestProject>false</IsTestProject>