Resolve rebase/stash conflict in project.pbxproj: keep single tor-nolzma reference and clean markers

.cache/clang/ModuleCache/Swift-207X6UTF85MUY.swiftmodule

@@ -1,12 +0,0 @@
----
-path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/Swift.swiftmodule/arm64e-apple-macos.swiftmodule'
-dependencies:
-  - mtime:           1757258659000000000
-    path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/Swift.swiftmodule/arm64e-apple-macos.swiftmodule'
-    size:            14166264
-  - mtime:           1754189697000000000
-    path:            'usr/lib/swift/Swift.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            2261306
-    sdk_relative:    true
-version:         1
-...

.cache/clang/ModuleCache/SwiftOnoneSupport-3W234PQLRG1JJ.swiftmodule

@@ -1,16 +0,0 @@
----
-path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/SwiftOnoneSupport.swiftmodule/arm64e-apple-macos.swiftmodule'
-dependencies:
-  - mtime:           1757258662000000000
-    path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/SwiftOnoneSupport.swiftmodule/arm64e-apple-macos.swiftmodule'
-    size:            18068
-  - mtime:           1754189697000000000
-    path:            'usr/lib/swift/Swift.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            2261306
-    sdk_relative:    true
-  - mtime:           1754191141000000000
-    path:            'usr/lib/swift/SwiftOnoneSupport.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            1224
-    sdk_relative:    true
-version:         1
-...

.cache/clang/ModuleCache/_Concurrency-IW47C06QYY26.swiftmodule

@@ -1,16 +0,0 @@
----
-path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/_Concurrency.swiftmodule/arm64e-apple-macos.swiftmodule'
-dependencies:
-  - mtime:           1757258669000000000
-    path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/_Concurrency.swiftmodule/arm64e-apple-macos.swiftmodule'
-    size:            699544
-  - mtime:           1754189697000000000
-    path:            'usr/lib/swift/Swift.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            2261306
-    sdk_relative:    true
-  - mtime:           1754192470000000000
-    path:            'usr/lib/swift/_Concurrency.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            364219
-    sdk_relative:    true
-version:         1
-...

.cache/clang/ModuleCache/_StringProcessing-1C2ZFCSIKDXY1.swiftmodule

@@ -1,16 +0,0 @@
----
-path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/_StringProcessing.swiftmodule/arm64e-apple-macos.swiftmodule'
-dependencies:
-  - mtime:           1757258664000000000
-    path:            '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx/prebuilt-modules/26.0/_StringProcessing.swiftmodule/arm64e-apple-macos.swiftmodule'
-    size:            83568
-  - mtime:           1754189697000000000
-    path:            'usr/lib/swift/Swift.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            2261306
-    sdk_relative:    true
-  - mtime:           1754192532000000000
-    path:            'usr/lib/swift/_StringProcessing.swiftmodule/arm64e-apple-macos.swiftinterface'
-    size:            24507
-    sdk_relative:    true
-version:         1
-...

.gitattributes

@@ -1,20 +0,0 @@
-# Prevent Github Languages stats skewing:
-
-# Binaries and assets
-**/*.xcframework/** linguist-vendored
-**/*.xcassets/** linguist-vendored
-
-# Generated files
-**/*.pbxproj linguist-generated
-**/*.storyboard linguist-generated
-Package.resolved linguist-generated
-
-# Downloaded CSVs
-relays/online_relays_gps.csv linguist-vendored
-
-# Docs
-**/*.md linguist-documentation
-
-# Configs
-Configs/*.xcconfig linguist-documentation
-**/*.plist linguist-documentation

.github/workflows/swift-tests.yml

@@ -24,4 +24,4 @@ jobs:
         run: swift build
 
       - name: Run Tests
-        run: swift test --parallel
+        run: swift test --parallel --disable-swift-testing  # so it only runs xctests: https://github.com/swiftlang/swift-package-manager/issues/8529#issuecomment-2815711345

.gitignore

@@ -9,6 +9,9 @@ plans/
 CLAUDE.md
 AGENTS.md
 
+## User settings
+xcuserdata/
+
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint
 *.xccheckout
@@ -54,8 +57,7 @@ iOSInjectionProject/
 
 ## Xcode project
 *.xcodeproj/project.xcworkspace/
-## Xcode User settings
+*.xcodeproj/xcshareddata/
-xcuserdata/
 
 ## Python
 __pycache__/
@@ -73,6 +75,3 @@ TestResult.xcresult/
 *.xcresult/
 build.log
 *.log
-
-# Local configs
-Local.xcconfig

Configs/Debug.xcconfig

@@ -1,4 +0,0 @@
-#include "Release.xcconfig"
-
-// Optional include of local configs
-#include? "Local.xcconfig"

Configs/Local.xcconfig.example

@@ -1,5 +0,0 @@
-// Your Apple Developer Team ID - https://stackoverflow.com/a/18727947
-DEVELOPMENT_TEAM = ABC123
-
-// Unique bundle id to be able to register and run locally
-PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat.$(DEVELOPMENT_TEAM)

Configs/Release.xcconfig

@@ -1,11 +0,0 @@
-MARKETING_VERSION = 1.4.4
-CURRENT_PROJECT_VERSION = 1
-
-IPHONEOS_DEPLOYMENT_TARGET = 16.0
-MACOSX_DEPLOYMENT_TARGET = 13.0
-SWIFT_VERSION = 5.0
-
-DEVELOPMENT_TEAM = L3N5LHJD5Y
-CODE_SIGN_STYLE = Automatic
-
-PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat