From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Mon, 20 Jul 2020 08:57:09 +0000 (+1000)
Subject: Restore trailing tab to fix merge conflict
X-Git-Tag: xonotic-v0.8.5~352^2~59
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8e7d21da2c1a5f8701f3abde89c8dc4fa7da5100

Restore trailing tab to fix merge conflict
---

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index c21519c2a..f7c29a26e 100644
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -18,7 +18,7 @@ void W_Shotgun_Attack(Weapon thiswep, entity actor, .entity weaponentity, float
 
 	for(int sc = 0;sc < bullets;sc = sc + 1)
 		fireBullet_antilag(actor, weaponentity, w_shotorg, w_shotdir, spread, solidpenetration, damage, force, thiswep.m_id, bullet_trail_effect, false);
-
+	
 	if(lag && bullets > 0)
 		antilag_restore_all(actor);