reslove conflict from upstream

author Michael D. Lowis <mike.lowis@gentex.com>

Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)

committer Michael D. Lowis <mike.lowis@gentex.com>

Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)
author Michael D. Lowis <mike.lowis@gentex.com>
Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)
committer Michael D. Lowis <mike.lowis@gentex.com>
Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)
diff --cc .gitignore

index 25b12e208dcf8143be3273752f79373457fa85e5,be21bae3aceb4555e66e6d9dfee317929a41c6a0..93dc0974ca5f715440382f4ac9f25a6cb4f3a3d4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,4 @@@
   tags
   *.o
+ +*.a
+ test
author	Michael D. Lowis <mike.lowis@gentex.com>
	Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)
committer	Michael D. Lowis <mike.lowis@gentex.com>
	Tue, 18 Dec 2018 21:19:57 +0000 (16:19 -0500)