Skip to content

Commit d28484b

Browse files
authored
Update package.json
1 parent 08cdc5e commit d28484b

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

package.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
<<<<<<< HEAD
2-
{"name":"@smarthtmlelements/smart-tabs","version":"4.5.0","description":"Smart Tabs","scripts":{},"repository":{"type":"git","url":"git+https://github.com/HTMLElements/smart-tabs.git"},"author":"Smart HTML Elements","license":"SEE LICENSE IN https://www.htmlelements.com/license/","bugs":{"url":"https://github.com/HTMLElements/smart-tabs"},"homepage":"https://github.com/HTMLElements/smart-tabs#readme","devDependencies":{},"dependencies":{"@webcomponents/webcomponentsjs":"^1.0.22","@smarthtmlelements/smart-core":"^1.1.0"},"main":"index.js","directories":{},"keywords":["custom","element","tabs custom element","html tabs","tabs","web components tabs","tabs element","tabstrip","custom tabs","tabs widget","tabs ui","tabs component","tabs control","custom elements","webcomponents","tabs custom element","tabstrip","tabstrip element","tabstrip user interface","material tabs","material tabstrip"]}
3-
=======
41
{
52
"name": "@smarthtmlelements/smart-tabs",
6-
"version": "2.0.0",
3+
"version": "4.5.0",
74
"description": "Smart Tabs",
85
"scripts": {
96
},
@@ -22,7 +19,7 @@
2219
},
2320
"dependencies": {
2421
"@webcomponents/webcomponentsjs": "^1.0.22",
25-
"@smarthtmlelements/smart-core": "^2.0.0"
22+
"@smarthtmlelements/smart-core": "^4.5.0"
2623
},
2724
"main": "index.js",
2825
"directories": {},
@@ -34,20 +31,22 @@
3431
"tabs",
3532
"web components tabs",
3633
"tabs element",
37-
"tabstrip",
34+
"tabs",
3835
"custom tabs",
3936
"tabs widget",
4037
"tabs ui",
4138
"tabs component",
4239
"tabs control",
4340
"custom elements",
4441
"webcomponents",
45-
"tabs custom element",
46-
"tabstrip",
47-
"tabstrip element",
48-
"tabstrip user interface",
49-
"material tabs",
50-
"material tabstrip"
42+
"tabs bar custom element",
43+
"tabs",
44+
"tabs element",
45+
"tabs user interface",
46+
"tabs control",
47+
"material tabs",
48+
"tabs web component",
49+
"bootstrap tabs component",
50+
"tabstrip"
5151
]
5252
}
53-
>>>>>>> origin/master

0 commit comments

Comments
 (0)