truly fixed

Beluga-lang · Apr 26, 2024 · cd74132 · cd74132
1 parent 5acfa9f
commit cd74132
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/theories/Core/Semantic/PER.v b/theories/Core/Semantic/PER.v
@@ -1,9 +1,4 @@
 From Coq Require Import Lia PeanoNat Relations.
-<<<<<<< HEAD
-=======
-From Equations Require Import Equations.
-
->>>>>>> 47fa52f5eb989104966e70555de900ab7ce0e164
 From Mcltt Require Import Base Domain Evaluate Readback Syntax System.
 From Equations Require Import Equations.