From 8dfc1afb01a3885a4e6b5615a8140564438798fb Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Thu, 22 Dec 2022 14:43:13 +0000
Subject: [PATCH] chore(release): cut 31.12.15 [skip ci]

## [31.12.15](https://github.com/dhis2/tracker-capture-app/compare/v31.12.14...v31.12.15) (2022-12-22)

### Bug Fixes

* [DHIS2-14352] remove merge conflict artifact ([#1646](https://github.com/dhis2/tracker-capture-app/issues/1646)) ([5602931](https://github.com/dhis2/tracker-capture-app/commit/5602931b70002086d357f516ee05948b16064e37))
---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94bfb5f61..d656aa053 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [31.12.15](https://github.com/dhis2/tracker-capture-app/compare/v31.12.14...v31.12.15) (2022-12-22)
+
+
+### Bug Fixes
+
+* [DHIS2-14352] remove merge conflict artifact ([#1646](https://github.com/dhis2/tracker-capture-app/issues/1646)) ([5602931](https://github.com/dhis2/tracker-capture-app/commit/5602931b70002086d357f516ee05948b16064e37))
+
 ## [31.12.14](https://github.com/dhis2/tracker-capture-app/compare/v31.12.13...v31.12.14) (2022-12-22)
 
 
diff --git a/package.json b/package.json
index b08ac3df8..8862ff6c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tracker-capture-app",
-  "version": "31.12.14",
+  "version": "31.12.15",
   "description": "DHIS2 tracker capture app",
   "main": "index.js",
   "scripts": {