From: Michael D. Lowis <mike@mdlowis.com>
Date: Thu, 24 Sep 2015 23:15:19 +0000 (-0400)
Subject: merged conflicts
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=98d86c0d83abdfbac043927beef432076125f9b3;p=proto%2Fgir.git

merged conflicts
---

98d86c0d83abdfbac043927beef432076125f9b3
diff --cc source/parser.c
index 63fde05,a3094db..6a3ed98
--- a/source/parser.c
+++ b/source/parser.c
@@@ -1,7 -1,13 +1,8 @@@
  /**
    @file parser.c
  */
+ //#include "parser.h"
  #include "gir_internals.h"
 -#include <stdlib.h>
 -#include <stdio.h>
 -#include <ctype.h>
 -#include <string.h>
 -#include <stdint.h>
  
  #define UNKNOWN     0
  #define SYMBOL      1