diff options
Diffstat (limited to 'src/lem_interp')
| -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 |