Skip to content

Commit c7433f5

Browse files
author
uifortdev
committed
readme file updates
2 parents 83dc6cf + 8ffee15 commit c7433f5

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 Horia S
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
</h1>
1313
<div align="center">
1414

15+
<<<<<<< HEAD
1516
![version](https://img.shields.io/badge/version-1.1.0-blue.svg)
17+
=======
18+
![version](https://img.shields.io/badge/version-1.0.0-blue.svg)
19+
>>>>>>> 8ffee1570dfe3350ea3fcabda92cc721ea687d64
1620
![license](https://img.shields.io/badge/license-MIT-blue.svg)
1721

1822
<a href="https://bloomui.com/product/tokyo-free-white-react-typescript-material-ui-admin-dashboard/"><img src="https://bloomui.s3.us-east-2.amazonaws.com/tokyo-free-white-react-typescript-material-ui-admin-dashboard.jpg" /></a>
@@ -58,4 +62,8 @@ We’ve included a few page examples for most used user flows that will give you
5862
You can open a support ticket by sending an email here: <a href="mailto:support@bloomui.freshdesk.com" title="Open Support Ticket">
5963
support@bloomui.freshdesk.com
6064
</a>
61-
</p>
65+
<<<<<<< HEAD
66+
</p>
67+
=======
68+
</p>
69+
>>>>>>> 8ffee1570dfe3350ea3fcabda92cc721ea687d64

0 commit comments

Comments
 (0)