fixup! Revert "Revert "SCP-2136 Inline single occurrence bounded terms (

#3257)" (#3344)"
IntersectMBO · Jul 9, 2021 · 0864428 · 0864428
1 parent 286284e
commit 0864428
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/plutus-core/plutus-ir/test/datatypes/listMatchEval.golden b/plutus-core/plutus-ir/test/datatypes/listMatchEval.golden
@@ -1,7 +1 @@
-<<<<<<< HEAD
-(delay (lam x_195 x_195))
-||||||| parent of 66189fa5c (Revert "Revert "SCP-2136 Inline single occurrence bounded terms (#3257)" (#3344)")
-(delay (lam x_31 x_31))
-=======
-(delay (lam x_21 x_21))
->>>>>>> 66189fa5c (Revert "Revert "SCP-2136 Inline single occurrence bounded terms (#3257)" (#3344)")
+(delay (lam x_705 x_705))
diff --git a/plutus-core/plutus-ir/test/recursion/even3Eval.golden b/plutus-core/plutus-ir/test/recursion/even3Eval.golden
@@ -1,7 +1 @@
-<<<<<<< HEAD
-(delay (lam case_True_635 (lam case_False_636 case_False_636)))
-||||||| parent of 66189fa5c (Revert "Revert "SCP-2136 Inline single occurrence bounded terms (#3257)" (#3344)")
-(delay (lam case_True_254 (lam case_False_255 case_False_255)))
-=======
-(delay (lam case_True_377 (lam case_False_378 case_False_378)))
->>>>>>> 66189fa5c (Revert "Revert "SCP-2136 Inline single occurrence bounded terms (#3257)" (#3344)")
+(delay (lam case_True_4485 (lam case_False_4486 case_False_4486)))