From c8d1287e10edb9d4446067fd7b1e3a64a7e4d9e9 Mon Sep 17 00:00:00 2001
From: xorstream <xorstream@users.noreply.github.com>
Date: Mon, 23 Jan 2017 01:13:13 +1100
Subject: [PATCH] gitignore seems to have an undisclosed conflict?! fixed here.

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bdf3002..ed3f6e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,9 @@
 *.so
 *.so.*
 *.exe
-<<<<<<< Updated upstream
 *.dll
 *.class
 *.jar
-=======
->>>>>>> Stashed changes
 
 qemu/config-all-devices.mak