[wannier90/el5: 21/21] Update to 2.0.0.

[Susi Lehtola]

commit a14139b146cb5a263b65c314dcd8dcd1d73f7bee
Author: Susi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Oct 15 15:11:17 2013 +0300

    Update to 2.0.0.

 .gitignore |    2 --
 sources    |    4 ----
 2 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/sources b/sources
index 5771980..96647eb 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-764165971f0ee35ff16041320c2cbc29  wannier90-1.2.tar.gz
-=======
 c5e120daa414ab6546bdd549675a23e8  wannier90-2.0.0.tar.gz
->>>>>>> master