@eturnity/eturnity_reusable_components 7.33.1 → 7.33.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/inputs/inputNumber/index.vue +0 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_reusable_components",
3
- "version": "7.33.1",
3
+ "version": "7.33.2",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
package/src/components/inputs/inputNumber/index.vue CHANGED
@@ -72,12 +72,8 @@
72
72
  </IconWrapper>
73
73
  <SelectWrapper v-if="showSelect">
74
74
  <Divider />
75
- <<<<<<< HEAD
76
75
  <RCSelect
77
- =======
78
- <Select
79
76
  :disabled="isSelectDisabled"
80
- >>>>>>> f7f274d10df532971e44249a355b2a458d105e1c
81
77
  :select-width="`${selectWidth}px`"
82
78
  :show-border="false"
83
79
  @input-change="$emit('select-change', $event)"