[ldc/f16] Add source

[MERCIER Jonathan]

commit adaf14a22d7b22bab2958468fb6d5d113898ab6b
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date:   Tue Oct 4 19:51:32 2011 +0200

    Add source

 .gitignore |    5 +++++
 sources    |    4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7249556..1a882d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@ ldc-20100804hg1655.tar.xz
 /ldc-20100102hg1705.tar.xz
 /ldc-20110115hg1832.tar.xz
 /ldc-20110901git58d40d2.tar.xz
+/ldc_fix_build.patch
+/ldc-20110915git423076d.tar.xz
+/ldc-druntime-20110915gitfba10fa.tar.xz
+/ldc-phobos-20110915gita8106d9.tar.xz
+/macros.ldc
diff --git a/sources b/sources
index 398decc..4cfab3c 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-8fed5536592380a90e3e6f3748bcc364  ldc-20110901git58d40d2.tar.xz
-=======
 933b6891b9d7079984d69a0c5e5bb908  ldc_fix_build.patch
 6f58232c2a7553dd25ee10cc5290bd19  ldc-20110915git423076d.tar.xz
 bddc6dc464f0be3cfd887400052de9d4  ldc-druntime-20110915gitfba10fa.tar.xz
 651c18c92efe41b42ecbc1e44ddc0218  ldc-phobos-20110915gita8106d9.tar.xz
 79c203a287c764bed1e612d7b77e1901  macros.ldc
->>>>>>> f844d0f... Update to latest revision