Conflict Resolution

2026-07-13 08:04:22 +01:00 · 2019-03-27 02:37:20 -04:00
parent c8006a6e84
commit c8ca8efa62
2 changed files with 0 additions and 5 deletions
@@ -180,8 +180,6 @@ the artifact triggers the rage.
 	accuracy = -75				// Aiming requires focus.
 	accuracy_dispersion = 3		// Ditto.
 	evasion = -45				// Too angry to dodge.
-<<<<<<< HEAD
-=======

 // Non-cult version of deep wounds.
 // Surprisingly, more dangerous.