Fixes after rebasing

This commit is contained in:
Erik Ziegler committed 2020-05-15 14:29:27 +02:00
1 parent 70b7158c9b
commit f3f50d11fe
105 files changed
+920 -3853

No files matched your search

-44
View File
@@ -1,46 +1,3 @@
<<<<<<< HEAD
# Basic Docz example
## Using `create-docz-app`
```sh
npx create-docz-app docz-app-basic
# or
yarn create docz-app docz-app-basic
```
## Download manually
```sh
curl https://codeload.github.com/doczjs/docz/tar.gz/master | tar -xz --strip=2 docz-master/examples/basic
mv basic docz-basic-example
cd docz-basic-example
```
## Setup
```sh
yarn # npm i
```
## Run
```sh
yarn dev # npm run dev
```
## Build
```sh
yarn build # npm run build
```
## Serve built app
```sh
yarn serve # npm run serve
```
=======
# @ohif/ui
React component library powered by `docz`
@@ -60,4 +17,3 @@ yarn build # npm run build
# Serve (the "build" output)
yarn serve # npm run serve
```
>>>>>>> 4a8675655... feat: nuke UI project; start new with updated tooling BREAKING_CHANGE (#1468)