fix merge conflict

Author: joshedney

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Dependencies
 
 Update bugsnag-android to [v6.19.0](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.19.0) [#262](https://github.com/bugsnag/bugsnag-unreal/pull/262)
+Update bugsnag-cocoa to [v6.34.1](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.34.1) [#263](https://github.com/bugsnag/bugsnag-unreal/pull/263)
 
 Changelog
 =========

Plugins/Bugsnag/Source/ThirdParty/BugsnagCocoa/BugsnagCocoa.Build.cs

@@ -14,6 +14,7 @@ public BugsnagCocoa(ReadOnlyTargetRules Target) : base(Target)
 		CheckFileExists(Path.Combine(IncludePath, "Bugsnag", "Bugsnag.h"));
 		CheckFileExists(Path.Combine(IncludePath, "BugsnagPrivate", "Bugsnag+Private.h"));
 		PublicSystemIncludePaths.Add(IncludePath);
+		PublicSystemIncludePaths.Add(Path.Combine(IncludePath, "BugsnagPrivate"));
 
 		string LibraryPath = Path.Combine(ModuleDirectory, Target.Platform.ToString(), "libBugsnagStatic.a");
 		CheckFileExists(LibraryPath);

deps/bugsnag-cocoa

@@ -21,7 +21,8 @@ clean:
 
 $(HEADERS): $(shell find $(SRCDIR) -type f -name '*.h')
 	rsync --delete --recursive --times $(SRCDIR)/include/ $@/
-	find $(SRCDIR) -type f -name '*.h' | grep -v $(SRCDIR)/include/ | rsync --delete --files-from - --no-relative --times . $@/BugsnagPrivate/
+	find $(SRCDIR) -type f -name '*.h' | grep -v $(SRCDIR)/include/ | rsync --files-from - --no-relative --times . $@/BugsnagPrivate/
+	rsync --recursive --times --include='*/' --include='*.h' --exclude='*' --prune-empty-dirs $(SRCDIR)/ $@/BugsnagPrivate/ --exclude=include/
 	touch $@
 
 $(IOS_LIB): $(shell find $(SRCDIR) -type f)