Overlay merge gone astray

AdamNiederer / cov

An emacs extension for displaying coverage data on your code

GNU General Public License v3.0

76 stars 16 forks source link

Closed theldoria closed 7 years ago

theldoria commented 7 years ago

I think you merged this while I was trying to resolve merge conflicts.

Now your master is dysfunctional, unless you merge this (I hope)...

AdamNiederer commented 7 years ago

Woo, git!