More merge fixes

2020-03-27 21:48:58 +00:00 · 2020-03-27 21:48:58 +00:00 · 5604613642
commit 5604613642
parent da3ab3d56e
9 changed files with 69 additions and 9 deletions
--- a/src/core/hle/service/cecd/cecd.h
+++ b/src/core/hle/service/cecd/cecd.h
@ -258,7 +258,7 @@ public:
            ar& data_path_type;
            ar& open_mode.raw;
            ar& path;
-            ar& file;
+            // ar& file;
        }
        friend class boost::serialization::access;
    };