From 757895aa0621f968b106a309e1999e04341550a4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:23:11 +0000
Subject: [PATCH] chore(main): release 1.5.1

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9df96a..275f48f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.5.1](https://github.com/jonathanmorris180/salesforce.nvim/compare/v1.5.0...v1.5.1) (2024-08-08)
+
+
+### Bug Fixes
+
+* always ignore conflicts when running diff ([3e30061](https://github.com/jonathanmorris180/salesforce.nvim/commit/3e30061c5f09cd18b222c9dc57ee28abc995ce9d))
+* diagnostics always show in correct buffer after push/pull ([0e55ba1](https://github.com/jonathanmorris180/salesforce.nvim/commit/0e55ba1e00f5e73acd9e56386f4d455e5ee9ad9f))
+
 ## [1.5.0](https://github.com/jonathanmorris180/salesforce.nvim/compare/v1.4.1...v1.5.0) (2024-07-09)