mirror of https://github.com/dapr/quickstarts.git
fix merge conflict
Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>
This commit is contained in:
parent
7d7c67092d
commit
b9702bf803
|
@ -44,11 +44,7 @@ dapr run --app-id order-processor --resources-path ../../../resources/ -- java -
|
|||
```bash
|
||||
cd ../state_management/javascript/sdk/order-processor
|
||||
npm install
|
||||
<<<<<<< HEAD
|
||||
dapr run --app-id order-processor --config ../config.yaml --components-path ../../../components/ -- npm start
|
||||
=======
|
||||
dapr run --app-id order-processor --resources-path ../../../resources/ -- npm start
|
||||
>>>>>>> upstream/master
|
||||
```
|
||||
|
||||
### Python example:
|
||||
|
|
Loading…
Reference in New Issue