From 6ced0c5a303bca5f2c4df5e98531f8b4a10b504e Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Thu, 9 Feb 2023 10:18:19 +0800 Subject: [PATCH] Removes git commentary from pbxproj --- NetNewsWire.xcodeproj/project.pbxproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index ef1f791ff..460fe05d7 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -3528,11 +3528,8 @@ 511D43D2231FA62C00FB1562 /* GlobalKeyboardShortcuts.plist in Resources */, 84C9FCA12262A1B300D921D6 /* Main.storyboard in Resources */, 51BB7C312335ACDE008E8144 /* page.html in Resources */, -<<<<<<< HEAD 512392C324E3451400F11704 /* TwitterAdd.storyboard in Resources */, -======= 516A093723609A3600EAE89B /* SettingsComboTableViewCell.xib in Resources */, ->>>>>>> main 51077C5A27A86D16000C71DB /* Hyperlegible.nnwtheme in Resources */, DDF9E1D928EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */, 51DEE81A26FBFF84006DAA56 /* Promenade.nnwtheme in Resources */,