Merge branch feature-delete
authorHelmut Grohne <grohne@cs.uni-bonn.de>
Mon, 27 Jan 2014 12:46:47 +0000 (13:46 +0100)
committerHelmut Grohne <grohne@cs.uni-bonn.de>
Mon, 27 Jan 2014 12:46:47 +0000 (13:46 +0100)
Most conflicts stem from varying imports or added functions and a
take-both approach merges them. A notable exception is theorem-2, where
a new result sequence-cong was required. Apart from that, theorem-2
could be taken almost verbatim from feature-delete albeit its type
coming from feature-decsetoid.

Conflicts:
Bidir.agda
FinMap.agda
Generic.agda
Precond.agda


No differences found