From 3c3170bc21ccbf36feacc36782b5925960b60965 Mon Sep 17 00:00:00 2001
From: Abel Soares Siqueira <abel.s.siqueira@gmail.com>
Date: Fri, 22 Sep 2023 09:13:57 +0200
Subject: [PATCH] Hot fix and release 0.1.5

---
 .github/workflows/Compliance.yml.jinja | 1 +
 CHANGELOG.md                           | 9 ++++++++-
 Project.toml                           | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Compliance.yml.jinja b/.github/workflows/Compliance.yml.jinja
index 1533b4c0..8ff68a50 100644
--- a/.github/workflows/Compliance.yml.jinja
+++ b/.github/workflows/Compliance.yml.jinja
@@ -28,6 +28,7 @@ jobs:
           echo -e "Automated changed by Compliance.yml workflow\n" > /tmp/body.md
           echo -e 'Rejected changes (if any):\n```diff\n' >> /tmp/body.md
           find . -name "*.rej" | xargs cat >> /tmp/body.md
+          find . -name "*.rej" | xargs rm -f
           echo -e '```' >> /tmp/body.md
           git diff
       - name: Run pre-commit to run the formatters
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22508afe..fb493285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.1.5] - 2023-09-22
+
+### Fixed
+
+- Properly fix compliance when there are conflicts
+
 ## [0.1.4] - 2023-09-22
 
 ### Fixed
@@ -62,7 +68,8 @@ and this project adheres to [Semantic Versioning].
 
 <!-- Versions -->
 <!-- markdown-link-check-disable -->
-[unreleased]: https://github.com/abelsiqueira/COPIERTemplate.jl/compare/v0.1.4...HEAD
+[unreleased]: https://github.com/abelsiqueira/COPIERTemplate.jl/compare/v0.1.5...HEAD
+[0.1.5]: https://github.com/abelsiqueira/COPIERTemplate.jl/releases/tag/v0.1.5
 [0.1.4]: https://github.com/abelsiqueira/COPIERTemplate.jl/releases/tag/v0.1.4
 [0.1.3]: https://github.com/abelsiqueira/COPIERTemplate.jl/releases/tag/v0.1.3
 [0.1.2]: https://github.com/abelsiqueira/COPIERTemplate.jl/releases/tag/v0.1.2
diff --git a/Project.toml b/Project.toml
index 41bf8b48..fa814e37 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "COPIERTemplate"
 uuid = "5022dd56-1d41-4538-9f4c-b20739ff8283"
 authors = ["Abel Soares Siqueira <abel.s.siqueira@gmail.com> and contributors"]
-version = "0.1.4"
+version = "0.1.5"
 
 [compat]
 julia = "1.6"