fix rebase conflicts

rpcs3/Crypto/ec.cpp

@@ -1,4 +1,4 @@
-// Copyright 2007,2008,2010  Segher Boessenkool  <segher@kernel.crashing.org>
+// Copyright 2007,2008,2010  Segher Boessenkool  <segher@kernel.crashing.org>
 // Licensed under the terms of the GNU GPL, version 2
 // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 

rpcs3/Crypto/unpkg.h

@@ -1,6 +1,9 @@
-#pragma once
+#pragma once
 
 #include "Loader/PSF.h"
+#include "util/endian.hpp"
+#include "util/types.hpp"
+#include "Utilities/File.h"
 #include <sstream>
 #include <iomanip>
 

rpcs3/Crypto/utils.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2014       Hykem <hykem@hotmail.com>
+// Copyright (C) 2014       Hykem <hykem@hotmail.com>
 // Licensed under the terms of the GNU GPL, version 3
 // http://www.gnu.org/licenses/gpl-3.0.txt