[aajohan-comfortaa-fonts/f16] updated source

[Luya Tshimbalanga]

commit 76a4e96b45f48ebcaaff56be9102dd19ee4df63b
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sun Dec 30 00:52:41 2012 -0800

    updated source

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index f0221cf..69de72e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d60ae9d9698dd2cd9b954c4d0019cddd  comfortaa___font_by_aajohan-d1qr019.zip
-=======
 3435f334feb749e5e69669fc393e95d1  comfortaa___font_by_aajohan-d1qr019.zip
->>>>>>> master