Skip to content

Commit

Permalink
Remove conflict markers
Browse files Browse the repository at this point in the history
  • Loading branch information
@p-offtermatt
p-offtermatt committed Mar 13, 2024
1 parent 24942e2 commit b30b6be
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions tests/mbt/model/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ As an optional module, it can also include KeyAssignment.
To run with key assignment, specify the step flag: `--step stepKeyAssignment`.

KeyAssignment also needs some different invariants, see below.
<<<<<<< HEAD

#### Partial Set Security

To run with Partial Set Security, specify the step flag `--step stepBoundedDriftKeyAndPSS`.
This runs both PSS and Key Assignment.
It also requires running with `ccv_boundeddrift.qnt`, see below.
=======
>>>>>>> main

#### ccv_boundeddrift.qnt
This state machine layer is more restricted to generate more interesting traces:
Expand Down

0 comments on commit b30b6be

Please sign in to comment.