From 4722ae4e132718a6635940b46ffb6485b61e6219 Mon Sep 17 00:00:00 2001
From: Michel Pollet <buserror@gmail.com>
Date: Fri, 24 Apr 2009 12:38:47 +0100
Subject: [PATCH] checksums.ini: Added curl 7.19.4

md5/sha
---
 conf/checksums.ini | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 0eff69eff7..e84e13c508 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -29322,4 +29322,11 @@ sha256=5844d7b36776d88afea5bc82f688f6d738ce233001c3dddfdd081d54dbe4384a
 md5=ad9bd58e1fb7babc74d0a0a16a1248a2
 sha256=2921fc96d4ca676190d6ffd45fa80e107c1fe12291c0c4f64827c29639863332
 
+<<<<<<< HEAD:conf/checksums.ini
 >>>>>>> b65db0a... checksum.ini: Added openrdate 1.2:conf/checksums.ini
+=======
+[http://curl.haxx.se/download/curl-7.19.4.tar.bz2]
+md5=2734167c1e5f7ce6be99b75d2d371d85
+sha256=fb3436280dedbc8f8141d3841a5964c4491dd6457bc5b7123854aed0b794be86
+
+>>>>>>> 85b968e... checksums.ini: Added curl 7.19.4:conf/checksums.ini
-- 
2.11.4.GIT