fix merge conflict

Signed-off-by: Mukundan Sundararajan <65565396+mukundansundar@users.noreply.github.com>
This commit is contained in:
Mukundan Sundararajan 2023-02-15 23:55:49 +05:30
parent 7d7c67092d
commit b9702bf803
1 changed files with 0 additions and 4 deletions

View File

@ -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: