From aa8c107f9e5fb518d278af55d595bd9619b5f504 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Tue, 16 Apr 2024 13:28:41 -0400
Subject: [PATCH] Resolved merge conflicts

LF-2988
---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5fb0041..016e682 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "fhirpath",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "fhirpath",
-      "version": "3.12.0",
+      "version": "3.13.0",
       "license": "SEE LICENSE in LICENSE.md",
       "dependencies": {
         "@lhncbc/ucum-lhc": "^5.0.0",
diff --git a/package.json b/package.json
index 57f94b3..e241ca4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "A FHIRPath engine",
   "main": "src/fhirpath.js",
   "dependencies": {