resolve merge conflicts

openmrs · Sep 20, 2024 · 8d93ecd · 8d93ecd
2 parents 1562a06 + a5010ae
commit 8d93ecd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/distro/pom.xml b/distro/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs</groupId>
     <artifactId>distro-emr</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distro-emr-configuration</artifactId>
@@ -27,7 +27,7 @@
     <authentication.version>1.0.0</authentication.version>
     <openmrs.version>2.6.7</openmrs.version>
     <initializer.version>2.7.0</initializer.version>
-    <webservices.rest.version>2.44.0</webservices.rest.version>
+    <webservices.rest.version>2.45.0-SNAPSHOT</webservices.rest.version>
     <addresshierarchy.version>2.17.0</addresshierarchy.version>
     <idgen.version>4.10.0</idgen.version>
     <legacyui.version>1.16.0</legacyui.version>
@@ -48,7 +48,7 @@
     <serialization-xstream.version>0.2.16</serialization-xstream.version>
     <ordertemplates.version>1.0.2</ordertemplates.version>
     <patientflags.version>3.0.7</patientflags.version>
-    <o3forms.version>2.3.0-SNAPSHOT</o3forms.version>
+    <o3forms.version>2.3.0</o3forms.version>
   </properties>
 
   <dependencies>

diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.openmrs</groupId>
     <artifactId>distro-emr</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>distro-emr-frontend</artifactId>

diff --git a/frontend/spa-assemble-config.json b/frontend/spa-assemble-config.json
@@ -36,9 +36,9 @@
     "@openmrs/esm-primary-navigation-app": "next",
     "@openmrs/esm-service-queues-app": "next",
     "@openmrs/esm-system-admin-app": "next",
+    "@openmrs/esm-user-onboarding-app": "next",
     "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": "next",
-    "@ohri/openmrs-esm-ohri-core-app": "next",
-    "@openmrs/esm-user-onboarding-app": "next"
+    "@ohri/openmrs-esm-ohri-core-app": "next"
   },
   "excludedFrontendModules": []
 }
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <name>Package and Run OpenMRS</name>
   <description>Convenient project to build an OpenMRS distribution and run it</description>
 
-  <version>3.2.0-SNAPSHOT</version>
+  <version>3.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <organization>