From: Ashley 'LadyHavoc' Hale <darkplacesengine@gmail.com>
Date: Mon, 2 May 2022 07:09:15 +0000 (-0700)
Subject: Resolved .gitignore conflict
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=a5e8522bdacd29c436bacd4f563939e350fb5d0f

Resolved .gitignore conflict
---

a5e8522bdacd29c436bacd4f563939e350fb5d0f
diff --cc .gitignore
index a6084b0d,7d90b57a..5ba9ca0f
--- a/.gitignore
+++ b/.gitignore
@@@ -24,7 -24,6 +24,10 @@@ Makefile.wi
  .ccls-cache
  *.gch
  /.vs
+ /build
+ /.cache
+ *.kdev4
 +*.vcxproj.user
 +*.pdb
 +*.lib
 +*.exp