Merge remote-tracking branch 'origin/new_lean' into new_lean

# Conflicts:
#	algebra/exactness.hlean
#	homotopy/pushout.hlean
#	move_to_lib.hlean
This commit is contained in:
Steve Awodey 2017-06-16 14:50:55 -04:00
parent a2c4e0858d
commit 89118f2a8e

View file

@ -129,6 +129,9 @@ definition derived_couple_A : AbGroup :=
definition derived_couple_B : AbGroup :=
homology (differential EC) (differential_is_differential EC)
print homology
definition derived_couple_i : derived_couple_A →g derived_couple_A :=
(image_lift (exact_couple.i EC)) ∘g (image_incl (exact_couple.i EC))