summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGravatar majorseitan@blockfreie.org <majorseitan@blockfreie.org>2018-05-26 13:29:12 -0400
committerGravatar majorseitan@blockfreie.org <majorseitan@blockfreie.org>2018-05-26 13:29:12 -0400
commitb4ffc6c4837e06c48a1a15ea662c25aa92566bf6 (patch)
tree8603215b244a1af9e9de8a436e044d062c5d6602 /tests
parentf993a516913883eda783bbe7cae80dfd42e2b428 (diff)
resolve merge conflict on test
Diffstat (limited to 'tests')
-rw-r--r--tests/jsonTest.ur4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/jsonTest.ur b/tests/jsonTest.ur
index 715e225d..bce269bd 100644
--- a/tests/jsonTest.ur
+++ b/tests/jsonTest.ur
@@ -2,6 +2,6 @@ open Json
fun main () : transaction page = return <xml><body>
<pre>{[ fromJson "\"\\\\line \/ 1\\nline 2\"" : string ]}</pre><br/>
- {[fromJson "[1, 2, 3]" : list int]}<br/>
- {[toJson ("hi" :: "bye\"" :: "hehe" :: [])]}
+ <pre>{[fromJson "[1, 2, 3]" : list int]}</pre><br/>
+ <pre>{[toJson ("hi" :: "bye\"" :: "hehe" :: [])]}</pre>
</body></xml>