From f49a02d839b62c4b125aeb440c760b462c9d53c3 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Sat, 17 Nov 2018 23:19:06 -0500
Subject: [PATCH] Fix merge error

---
 src/actions/attack.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp
index 8a50b413a204..56a649a4e897 100644
--- a/src/actions/attack.cpp
+++ b/src/actions/attack.cpp
@@ -1738,6 +1738,7 @@ int combat_modifier(const time_of_day& effective_tod,
 		unit_type::ALIGNMENT alignment,
 		bool is_fearless)
 {
+	const tod_manager& tod_m = *resources::tod_manager;
 	const int lawful_bonus = effective_tod.lawful_bonus;
 	return generic_combat_modifier(lawful_bonus, alignment, is_fearless, tod_m.get_max_liminal_bonus());
 }