Merge branch 'master' of

https://github.com/ustraframework/ustraframework-sample.git

Conflicts:
	front/bo/client/assets/font/fontagon-icons.css
	front/bo/client/assets/font/fontagon-icons.eot
	front/bo/client/assets/font/fontagon-icons.less
	front/bo/client/assets/font/fontagon-icons.sass
	front/bo/client/assets/font/fontagon-icons.styl
	front/bo/client/assets/font/fontagon-icons.ttf
	front/bo/client/assets/font/fontagon-icons.woff
	front/bo/client/assets/font/fontagon-icons.woff2
	front/bo/package.json
	front/cmm/package.json
	front/fo/package.json
	front/yarn.lock

back/root/bo/build.gradle

@@ -7,7 +7,7 @@ repositories {
 
 
 dependencies {
-	compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.14.RELEASE'
+	compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.15.RELEASE'
     compile project(":cmm")
 }
 

back/root/bo/src/main/resources/application.yml

@@ -41,13 +41,11 @@ ustra:
     procedure-manager:
       enabled: true
     datasource:
-      default-datasource-name: rds2
+      default-datasource-name: rds1
       datasources:
         rds1:
           url: jdbc:log4jdbc:sqlserver://framework-sqlserver.c0uiyan5ae24.ap-northeast-2.rds.amazonaws.com:1433;databaseName=USTRA_FW_SPL
           driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-#          username: gsitm_si_ustra_fw_spl_user
-#          password: itm@6700
           username: ENC(p6rIPoShJklFLPxHKNJYFLooNCd2xnkayNZ2f+GexyA17qEMS77u8g==)
           password: ENC(ohS/a1/Q/lKriwUq3rqJqht76fQ0Bnge)
         rds2:

back/root/cmm/build.gradle

@@ -7,7 +7,7 @@ repositories {
 
 
 dependencies {
-    compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.14.RELEASE'
+    compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE'
 }
 
 

back/root/fo/build.gradle

@@ -7,7 +7,7 @@ repositories {
 
 
 dependencies {
-	compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.14.RELEASE'
+	compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE'
     compile project(":cmm")
 }
 

front/.vscode/nuxt-bo.code-snippets

@@ -8,7 +8,7 @@
       "</template>",
       "<script lang=\"ts\">",
       "import { Vue, Component, Prop, Model, Ref, Watch, Inject, InjectReactive, Provide, ProvideReactive, PropSync, Emit } from 'vue-property-decorator'",
-      "import { CustomBoComponent } from '~/components/custom-bo-component'",
+      "import { SampleBoComponent } from '~/components/sample-bo-component'",
       "",
       "@Component({",
       "  middleware:async(ctx)=>{",
@@ -22,12 +22,7 @@
       "    // todo: asyncData",
       "  },",
       "})",
-      "/** ",
+      "export default class extends SampleBoComponent {",
-      " * @vuese",
-      " * @group component group",
-      " * component description",
-      " */",
-      "export default class extends CustomBoComponent {",
       "  // #region variables",
       "  // #endregion",
       "",
@@ -52,7 +47,7 @@
     "prefix": "@@@",
     "body": [
       "import { Vue, Component, Prop, Model, Ref, Watch, Inject, InjectReactive, Provide, ProvideReactive, PropSync, Emit } from 'vue-property-decorator'",
-      "import { CustomBoComponent } from '~/components/custom-bo-component'",
+      "import { SampleBoComponent } from '~/components/sample-bo-component'",
       "",
       "@Component({",
       "  middleware:async(ctx)=>{",

front/bo/client/assets/font/fontagon-icons.css

@@ -0,0 +1,52 @@
+@font-face {
+  font-family: 'fontagon-icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype"),
+url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2"),
+url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff");
+}
+
+.fontagon-icons, .ft-icons {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  vertical-align: middle;
+}
+
+.ft-icons {
+  width: 1em;
+  height: 1em;
+  position: relative;
+  fill: currentColor;
+}
+
+.fontagon-icons {
+  font-family: 'fontagon-icons';
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
+
+.ft-favicon:before { content: "\f101"; }

front/bo/client/assets/font/fontagon-icons.less

@@ -0,0 +1,60 @@
+.fontagon-contents(@value) {
+  content: @value;
+}
+
+@font-face {
+  font-family: "fontagon-icons";
+  src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype");
+  src: url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2");
+  src: url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff");
+}
+
+
+.fontagon-icons, .ft-icons {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  vertical-align: middle;
+}
+
+.ft-icons {
+  width: 1em;
+  height: 1em;
+  position: relative;
+  fill: currentColor;
+}
+
+
+.fontagon-icons {
+  font-family: 'fontagon-icons';
+  font-weight: normal;
+  font-style: normal;
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
+
+  .ft-favicon {
+    &:before {
+      .fontagon-contents("\f101");
+    }
+  }

front/bo/client/assets/font/fontagon-icons.sass

@@ -3,9 +3,15 @@
 
 @font-face
   font-family: "fontagon-icons"
+<<<<<<< HEAD
   src: url("fontagon-icons.eot?0cd077f02bfb5caa99153ccb5d0d7d6e?#iefix") format("embedded-opentype")
   src: url("fontagon-icons.woff2?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff2")
   src: url("fontagon-icons.woff?0cd077f02bfb5caa99153ccb5d0d7d6e") format("woff")
+=======
+  src: url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype")
+  src: url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2")
+  src: url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff")
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
 .nf-icons, .nft-icons
   -webkit-user-select: none

front/bo/client/assets/font/fontagon-icons.styl

@@ -0,0 +1,52 @@
+fontagon-contents(value)
+  content value
+
+@font-face
+  font-family "fontagon-icons"
+  src url("fontagon-icons.eot?a9543d4ea110ea765b1b11f272d4f96f?#iefix") format("embedded-opentype")
+  src url("fontagon-icons.woff2?a9543d4ea110ea765b1b11f272d4f96f") format("woff2")
+  src url("fontagon-icons.woff?a9543d4ea110ea765b1b11f272d4f96f") format("woff")
+
+.fontagon-icons, .ft-icons
+  -webkit-user-select none
+  -moz-user-select none
+  -ms-user-select none
+  user-select none
+  display inline-flex
+  align-items center
+  justify-content center
+  vertical-align middle
+
+.ft-icons
+  width 1em
+  height 1em
+  position relative
+  fill currentColor
+
+.fontagon-icons
+  font-family 'fontagon-icons'
+  font-weight normal
+  font-style normal
+  display inline-block
+  line-height 1
+  text-transform none
+  letter-spacing normal
+  word-wrap normal
+  white-space nowrap
+  direction ltr
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing antialiased
+  /* Support for Safari and Chrome. */
+  text-rendering optimizeLegibility
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing grayscale
+
+  /* Support for IE. */
+  font-feature-settings 'liga'
+
+
+.ft-favicon
+  &:before
+    fontagon-contents "\f101"

front/bo/client/components/sample-bo-component.ts

@@ -2,8 +2,8 @@ import { Component } from 'vue-property-decorator'
 import { UstraBoComponent } from '@ustra/nuxt-mng-bo/src/components/ustra-bo-component'
 
 @Component
-export default class CustomBoComponent extends UstraBoComponent {
+export default class SampleBoComponent extends UstraBoComponent {
   mounted() {}
 }
 
-export { CustomBoComponent }
+export { SampleBoComponent }

front/bo/package.json

@@ -17,9 +17,15 @@
     "test": "jest --detectOpenHandles --forceExit"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable",
     "@ustra/nuxt-dx-mng-bo": "^2.0.17-stable",
     "@ustra/nuxt-mng-bo": "^2.0.17-stable",
+=======
+    "@ustra/nuxt": "^2.0.15-stable",
+    "@ustra/nuxt-dx-mng-bo": "^2.0.15-stable",
+    "@ustra/nuxt-mng-bo": "^2.0.15-stable",
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     "@ustra-sample/cmm": "1.0.0"
   }
 }

front/cmm/package.json

@@ -15,6 +15,10 @@
     "test": "jest --detectOpenHandles --forceExit"
   },
   "dependencies": {
+<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable"
+=======
+    "@ustra/nuxt": "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   }
 }

front/fo/nuxt.config.ts

@@ -46,7 +46,7 @@ export default async () => {
         title: '',
       },
       generation: {
-        generateDirPath: '../../../back/root/bo/src/main/resources/static',
+        generateDirPath: '../../../back/root/fo/src/main/resources/static',
         generateProfiles: [env.Profile.DEV, env.Profile.STAGING, env.Profile.PRODUCTION],
       },
     },

front/fo/package.json

@@ -18,8 +18,13 @@
   },
   "dependencies": {
     "@ustra-sample/cmm": "1.0.0",
+<<<<<<< HEAD
     "@ustra/nuxt": "^2.0.17-stable",
     "@ustra/nuxt-buefy": "^2.0.17-stable",
+=======
+    "@ustra/nuxt": "^2.0.15-stable",
+    "@ustra/nuxt-buefy": "^2.0.15-stable",
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     "animejs": "^3.2.1"
   }
 }

front/yarn.lock

@@ -2460,10 +2460,17 @@
     "@typescript-eslint/types" "4.28.5"
     eslint-visitor-keys "^2.0.0"
 
+<<<<<<< HEAD
 "@ustra/core@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.17-stable.tgz#723b91a7f1f268f6f5f133de82dfe87cd31a6e94"
   integrity sha512-KUs+L/ChQdCq2J2AaF8i1Dr5x8TfPSKmCEh818A6Rj9ShlF0XBuG05qJrQS/dXYGznPAbjhPBEwfY0W607+D/w==
+=======
+"@ustra/core@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/core/-/core-2.0.15-stable.tgz#aba759b8f56089acb38b88ca1447c59f3fb525ee"
+  integrity sha512-PsYCCUpQy0hZd9pbX0zPs7XysdkQklixLDD4v8xSW8KaGuR+HT3F/Irs8+kcv56DbhsUFyOoX1oxoyrqApxXtw==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
     axios "0.21.1"
     axios-jsonp-pro "1.1.8"
@@ -2487,59 +2494,133 @@
     winston "3.3.3"
     winston-daily-rotate-file "4.5.2"
 
+<<<<<<< HEAD
 "@ustra/data@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.17-stable.tgz#38ed92b63ddaa393eec98fdd63b34fcbfbc783d1"
   integrity sha512-1VMIVmxoPHmKvT3Aec2KOCw1NyHWPebFTOlB/ZqSo9sB+gosMOElY/iLYNzTysMc4mWvyOl1g5IR+23cZbdhMQ==
+=======
+"@ustra/data@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/data/-/data-2.0.15-stable.tgz#bafef43117385e18fb48099a1ac178f778e64090"
+  integrity sha512-6p/nRlPNxl88CS7o+6qdeqMlDPYHDN4H+LhFeUNLuuHjPu28L18dCPgcpn0/H0soUa/A8AOcO2GXx9bT50gZOA==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/core" "^2.0.17-stable"
+=======
+    "@ustra/core" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
+<<<<<<< HEAD
 "@ustra/nuxt-buefy@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.17-stable.tgz#cb9dd7706adf1515452e0660c29421a0a890258f"
   integrity sha512-KTYlCCb9mJWIF8RvV2JR7/oLneTv8+Xg9HcetZCqrPAa3l6WmompeVRn4pTg5BPTNp7cNUfttsBWMmN1LGe0Xw==
+=======
+"@ustra/nuxt-buefy@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-buefy/-/nuxt-buefy-2.0.15-stable.tgz#0f6bb02fc76679fc250f416663b68c31735d82db"
+  integrity sha512-nDD8K/gMFWQCfwM/BoM6Nawclqe/7yV7RVJczew4k1ZGaggFkik+p2Cz8nqbgImB9wePyPOllAM0YDZTMA8anQ==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/nuxt" "^2.0.17-stable"
+=======
+    "@ustra/nuxt" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     nuxt-buefy "^0.4.7"
 
+<<<<<<< HEAD
 "@ustra/nuxt-dx-mng-bo@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx-mng-bo/-/nuxt-dx-mng-bo-2.0.17-stable.tgz#eebb58f986784d69caa269e0beae50e215e16f6d"
   integrity sha512-1S9nz+GaJKErjp9lGkctwMPqqHHWRl5tXuG9LUpCUCJ32SX6tnHtcgdyyqj/8Z/Qhd7WldHevHSgC2cm7EjLsw==
+=======
+"@ustra/nuxt-dx-mng-bo@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx-mng-bo/-/nuxt-dx-mng-bo-2.0.15-stable.tgz#944e083be6ab8f925ad69ca0522ed2d4ac9c7e93"
+  integrity sha512-IrwZg+q7CfvBY/+ZQP2Mt2nJOvExwIZ7hxz1+/+usB0932VK4FmuxYsD3NUypygGwm4H0GfRkyYGI9akVjakow==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/nuxt-dx" "^2.0.17-stable"
     "@ustra/nuxt-mng-bo" "^2.0.17-stable"
+=======
+    "@ustra/nuxt-dx" "^2.0.15-stable"
+    "@ustra/nuxt-mng-bo" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
+<<<<<<< HEAD
 "@ustra/nuxt-dx@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.17-stable.tgz#e5377f32b62e939b7919f62f862ab79c4214ba8e"
   integrity sha512-WHvOD1uDfIM8xfoRQw+I8v00NzWo8QP1mfttix2BLmAXkl0/jNVDM6un/USDqNAxkwCSRMEg1qsAak5iexeS4Q==
+=======
+"@ustra/nuxt-dx@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-dx/-/nuxt-dx-2.0.15-stable.tgz#f7ca7df2a93dd98ce39175b4dac06a8c73cccfcb"
+  integrity sha512-gUsAqgI6FHRT1HP2EZ/73FOlN9onY1QuDmy2GN2OazfrrUqzOPVoo0P2/TCtPj/msuZ2kv+aaIThiKBN3sscEg==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/nuxt" "^2.0.17-stable"
+=======
+    "@ustra/nuxt" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     devextreme "20.1-stable"
     devextreme-cldr-data "^1.0.3"
     devextreme-vue "20.1-stable"
     globalize "^1.6.0"
     material-icons "^0.3.1"
 
+<<<<<<< HEAD
 "@ustra/nuxt-mng-bo@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.17-stable.tgz#7b8e37d4b24c48d825c01c98a44cbe5d77448543"
   integrity sha512-F+NdwnlS4LmHzpuDp99kIak+pehrXu5NQyDn7hmSekhwMNEYtNiMDqAVQRUb8EBp5yNJRnfbELLrsEJF6IrGlg==
+=======
+"@ustra/nuxt-mng-bo@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng-bo/-/nuxt-mng-bo-2.0.15-stable.tgz#0d22b0159426799c9b4c46c55400c0383ea08b37"
+  integrity sha512-ghqY1WgnYbBw7C1CTZ57k2xNRoth1C20gECAhyAhiusmml8SOf4IKCKt0GMs4w0Cg1PFD8dlz1FBh6xXDapZew==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/nuxt-mng" "^2.0.17-stable"
+=======
+    "@ustra/nuxt-mng" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
+<<<<<<< HEAD
 "@ustra/nuxt-mng@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.17-stable.tgz#4c8363c00df7921a1ace5f6f9afb01866fe575bd"
   integrity sha512-bMu/xRy/4bMjMf+pgTmBTQI2CjYyK7H+Sp4zd1OXotC0VrWdzy2twbmyI5rObfnB667XX+/4SVmDmX/ctx0ZiQ==
+=======
+"@ustra/nuxt-mng@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt-mng/-/nuxt-mng-2.0.15-stable.tgz#9288deb217d8d42dcc1e18e366030912e72f777c"
+  integrity sha512-TjQDeUUHTxW60er6KSIlcE9rVrnkBdaOxEi+vV5am6v1EhEpax1aOFQ3gUMvbTOyv3mZUgiDaA8xFJ77ON09qg==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
+<<<<<<< HEAD
     "@ustra/nuxt" "^2.0.17-stable"
+=======
+    "@ustra/nuxt" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
 
+<<<<<<< HEAD
 "@ustra/nuxt@^2.0.17-stable":
   version "2.0.17-stable"
   resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.17-stable.tgz#4e175a6d2509c0e6f0f545dfeb1e6212fc1ff291"
   integrity sha512-mHIVDqK+Yx3NYIxGO/SADD4cSKdzLRk9v4/hSar05l+J6NTeigNCbiLrRSSm+obBRUNGzm20fCh+8s+U6+xLqA==
+=======
+"@ustra/nuxt@^2.0.15-stable":
+  version "2.0.15-stable"
+  resolved "https://repo.gsitm.com/repository/npm-private/@ustra/nuxt/-/nuxt-2.0.15-stable.tgz#aa1d6018df96182a15e12dd12bd86dec54e81123"
+  integrity sha512-9flipaRPMuAo9zuZH6mK7HifN6LeNOcrxqRiQ8uYKLvswLhvNBSegzk/T80SyfMkiAB0tJ5m+6AN+Tt5QQTDlA==
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
   dependencies:
     "@nuxt/typescript-runtime" "0.4.10"
     "@nuxtjs/axios" "5.13.1"
@@ -2547,8 +2628,13 @@
     "@nuxtjs/proxy" "2.1.0"
     "@nuxtjs/redirect-module" "0.3.1"
     "@nuxtjs/router" "1.6.1"
+<<<<<<< HEAD
     "@ustra/core" "^2.0.17-stable"
     "@ustra/data" "^2.0.17-stable"
+=======
+    "@ustra/core" "^2.0.15-stable"
+    "@ustra/data" "^2.0.15-stable"
+>>>>>>> branch 'master' of https://github.com/ustraframework/ustraframework-sample.git
     add "2.0.6"
     bluebird "3.7.2"
     body-parser "1.19.0"