diff options
| author | Christopher Pulte | 2016-09-19 12:51:57 +0100 |
|---|---|---|
| committer | Christopher Pulte | 2016-09-19 12:51:57 +0100 |
| commit | 62c2f45fbb34703ebc6c43819f4450da5601dff4 (patch) | |
| tree | 0f29670ea9a29373079a6d4977e9450599923faa /src | |
| parent | 2b6965007cd3c0fe1cca45d59c29f74f8e3e3446 (diff) | |
remove conflict message
Diffstat (limited to 'src')
| -rw-r--r-- | src/lem_interp/interp_interface.lem | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lem_interp/interp_interface.lem b/src/lem_interp/interp_interface.lem index 9abb561d..cc0bef06 100644 --- a/src/lem_interp/interp_interface.lem +++ b/src/lem_interp/interp_interface.lem @@ -401,8 +401,6 @@ type read_kind = (* AArch64 reads *) | Read_acquire | Read_exclusive | Read_exclusive_acquire | Read_stream -<<<<<<< Updated upstream -======= instance (Show read_kind) let show = function | Read_plain -> "Read_plain" @@ -415,7 +413,7 @@ instance (Show read_kind) end end ->>>>>>> Stashed changes + type write_kind = (* common writes *) Write_plain |