From: Michael D. Lowis <mike.lowis@gentex.com>
Date: Tue, 18 Dec 2018 21:19:57 +0000 (-0500)
Subject: reslove conflict from upstream
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=466294f5fa0cdefe5ee10774996479a8d5d9bcd9;p=proto%2Flibregexp.git

reslove conflict from upstream
---

466294f5fa0cdefe5ee10774996479a8d5d9bcd9
diff --cc .gitignore
index 25b12e2,be21bae..93dc097
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
  tags
  *.o
 +*.a
+ test