[cpuid/f14/master: 7/7] * Sun Mar 06 2011 Fabian Affolter <fabian at bernewireless.net> - 20110305-1 - Updated to new upstream

[Fabian Affolter]

commit fb94e72fb4f310db164be77ee90991866590183d
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sun Mar 6 13:25:37 2011 +0100

    * Sun Mar 06 2011 Fabian Affolter <fabian at bernewireless.net> - 20110305-1
    - Updated to new upstream version 20110305

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 8589e2d..3a8c981 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-63a9c7833026ba47a24d780f7d70a452  cpuid-20101002.src.tar.gz
-=======
 c13317518ce5d9ddba07eff9ead8080c  cpuid-20110305.src.tar.gz
->>>>>>> master