Added subobjects

FiniteSets/Sub.v

@@ -0,0 +1,23 @@
+Require Import HoTT.
+Require Import disjunction lattice.
+
+Section subobjects.
+  Variable A : Type.
+
+  Definition Sub := A -> hProp.
+End subobjects.
+
+Section blah.
+  Variable A : Type.
+  Variable C : (A -> hProp) -> hProp.
+  Context `{Univalence}.
+
+  Instance blah : Lattice (Sub A).
+  Proof.
+    unfold Sub.
+    apply _.
+  Defined.  
+
+  Definition hasUnion := forall X Y, C X -> C Y -> C (max_fun X Y).
+  Definition hasIntersection := forall X Y, C X -> C Y -> C (min_fun X Y).
+End blah.

FiniteSets/fsets/properties_decidable.v

@@ -166,23 +166,6 @@ Section SetLattice.
     split ; toBool.      
   Defined.
   
-<<<<<<< HEAD
-=======
-  Instance lattice_fset : Lattice intersection (@U A)  (@E A) :=
-    {
-      commutative_min := _ ;
-      commutative_max := _ ;
-      associative_min := _ ;
-      associative_max := _ ;
-      idempotent_min := _ ;
-      idempotent_max := _ ;
-      neutralL_max := _ ;
-      neutralR_max := _ ;
-      absorption_min_max := _ ;
-      absorption_max_min := _
-    }.
-
->>>>>>> 8a65852d1b39137898bddbaf7cf949bceeb4a574
 End SetLattice.
 
 (* Comprehension properties *)