From: Petr Danecek <pd3@mac>
Date: Mon, 23 Apr 2012 19:07:13 +0000 (+0100)
Subject: Resolved merge conflict
X-Git-Url: https://git.donarmstrong.com/?p=samtools.git;a=commitdiff_plain;h=c560dcebed800084f30f3c277d13e6fd8629908c

Resolved merge conflict
---

c560dcebed800084f30f3c277d13e6fd8629908c
diff --cc misc/bamcheck.c
index efccf9a,f61fac1..e5bfb5d
--- a/misc/bamcheck.c
+++ b/misc/bamcheck.c
@@@ -981,9 -1018,7 +1018,7 @@@ void output_stats(stats_t *stats
      }
  }
  
- void bam_init_header_hash(bam_header_t *header);
- 
 -size_t getline(char **line, size_t *n, FILE *fp)
 +size_t mygetline(char **line, size_t *n, FILE *fp)
  {
      if (line == NULL || n == NULL || fp == NULL)
      {