Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
deemount committed Mar 11, 2024
2 parents 4b504b3 + fb6c989 commit 32de3bc
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<<<<<<< HEAD
# gobpmn

## Wiki
Expand Down Expand Up @@ -29,3 +30,6 @@ You can also test the idea behind it directly. Simply follow the link to the lab

+ [BPMN Specification](https://www.omg.org/spec/BPMN)
+ [Camunda BPMN](https://camunda.com/bpmn/)
=======
# gobpmnEngine
>>>>>>> origin/dev

0 comments on commit 32de3bc

Please sign in to comment.