From de317276d4af243b7146a9a4df78302f3aa523db Mon Sep 17 00:00:00 2001
From: anothersimulacrum <anothersimulacrum@gmail.com>
Date: Sat, 19 Feb 2022 00:46:54 +0000
Subject: [PATCH] Misc cleanup - newline at eof, no manual id load

It's incorrect to manually load the "id" member - generic factory will
handle that for us.

At a newline at the end of a file, because it makes git happy.
---
 src/butchery_requirements.cpp | 2 --
 src/character_modifier.h      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/butchery_requirements.cpp b/src/butchery_requirements.cpp
index a78212d1b13a0..2c38c9ca9019f 100644
--- a/src/butchery_requirements.cpp
+++ b/src/butchery_requirements.cpp
@@ -54,8 +54,6 @@ bool butchery_requirements::is_valid() const
 
 void butchery_requirements::load( const JsonObject &jo, const std::string & )
 {
-    mandatory( jo, was_loaded, "id", id );
-
     for( const JsonMember member : jo.get_object( "requirements" ) ) {
         float modifier = std::stof( member.name() );
         requirements.emplace( modifier, std::map<creature_size, std::map<butcher_type, requirement_id>> {} );
diff --git a/src/character_modifier.h b/src/character_modifier.h
index 0fc532e67fa65..548c44d0af266 100644
--- a/src/character_modifier.h
+++ b/src/character_modifier.h
@@ -77,4 +77,4 @@ struct character_modifier {
         friend class generic_factory<character_modifier>;
 };
 
-#endif // CATA_SRC_CHARACTER_MODIFIER_H
\ No newline at end of file
+#endif // CATA_SRC_CHARACTER_MODIFIER_H