resolve deleted files conflict

Browse Source

...

This commit is contained in:

Тайга committed 2026-05-30 12:01:25 +00:00

1 parent f331b08cc3

commit df2f387708

57 files changed

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.DS_Store

Vendored Regular → Executable

File mode changed.

.gitignore

Regular → Executable

File mode changed.

.stfolder/syncthing-folder-940f59.txt

Regular → Executable

File mode changed.

Untitled.canvas

Regular → Executable

File mode changed.

work/.DS_Store

Vendored Regular → Executable

File mode changed.

work/_index.md

Regular → Executable

File mode changed.

work/projects/executor-security-analysis.md

Regular → Executable

File mode changed.

work/projects/executor-skip-report.md

Regular → Executable

File mode changed.

work/projects/executor-v2-redesign.md

Regular → Executable

File mode changed.

work/projects/zulip-migration.md

Regular → Executable

File mode changed.

work/wiki/.DS_Store

Vendored Regular → Executable

File mode changed.

work/wiki/apple-browsers/_index.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/abn-experiment-framework.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/analytics-patterns.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/anti-patterns.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/app-lifecycle-state-machine.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/architecture.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/branch-naming-conventions.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/browserserviceskit-integration.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/ci-pipeline.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/code-style.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/design-system-designresourceskit.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/development-commands.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/duckplayer-userscript-integration.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/duckplayer.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/feature-flags-addition.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/feature-flags.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/general.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/import-hygiene.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/instrumentation-facades.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/ios-architecture.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/ios-tracker-blocking-implementation.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/logging-guidelines.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/macos-singletons-removal.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/macos-system-integration.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/macos-window-management.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/maestro-device-selection.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/network-quality-scoring.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/network-quality-test-config.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/network-quality-testing.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/network-quality-variance-scoring.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/performance-optimization.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/pixel-definitions.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/pixels.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/privacy-security.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/project-structure.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/pull-request.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/securevault-guidelines.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/shared-packages.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/subscription-architecture.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/swiftui-advanced.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/swiftui-style.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/testing.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/ui-testing.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/user-defaults-storage.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/vm-ui-testing.md

Regular → Executable

File mode changed.

work/wiki/apple-browsers/webkit-browser.md

Regular → Executable

File mode changed.