diff options
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ec4cd17ea8..61f0b54376 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -7711,11 +7711,7 @@ bool god_likes_butchery(god_type god) || god == GOD_MAKHLEB || god == GOD_TROG || god == GOD_LUGONU -<<<<<<< HEAD || (god == GOD_KIKUBAAQUDGHA && you.piety >= piety_breakpoint(4))); -======= - || (god == GOD_KIKUBAAQUDGHA && you.piety >= piety_breakpoint(4)); ->>>>>>> 38a99d5fb299818a3fa0dc79c9ddc5d0379aeb0a } bool god_hates_butchery(god_type god) |