hiro/accounts-ui
1
0
Fork 0
mirror of https://github.com/vale981/accounts-ui synced 2025-03-04 17:31:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflict

Browse source
This commit is contained in:
PolGuixe 2016-10-21 11:51:40 +02:00
parent 9492ae7c6e
commit 01c225349a
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -22,18 +22,12 @@ This package does not by standard come with any styling, you can easily [extend
* [**Basic**](https://atmospherejs.com/std/accounts-basic) `std:accounts-basic`
* [**Semantic UI**](https://atmospherejs.com/std/accounts-semantic) `std:accounts-semantic`
<<<<<<< HEAD
* Bootstrap 3
Help out on this: [http://github.com/studiointeract/accounts-bootstrap](http://github.com/studiointeract/accounts-bootstrap)
* [**Material UI**](https://atmospherejs.com/zetoff/accounts-material-ui) `zetoff:accounts-material-ui`
* Materil-UI with materialize
Help out on this: [http://github.com/studiointeract/accounts-material](http://github.com/studiointeract/accounts-material)
=======
* [**Bootstrap 3/4**](https://atmospherejs.com/std/accounts-bootstrap) `std:accounts-bootstrap`
* [**Ionic**](https://atmospherejs.com/std/accounts-ionic) `std:accounts-ionic`
* [**Material UI**](https://atmospherejs.com/zetoff/accounts-material-ui) `zetoff:accounts-material-ui`
* Material UI
Help out on this: [http://github.com/studiointeract/accounts-material](http://github.com/studiointeract/accounts-material)
>>>>>>> studiointeract/master
* Add your styled version here [Learn how](#create-your-own-styled-version)