From c0a1cd58ab6710066cfaacb4e1c141d01c751b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Thu, 2 Feb 2023 12:16:07 +0100 Subject: [PATCH] Removing SortFilterProxyModel submodule to avoid conflict when merging with status-desktop --- vendor/DOtherSide/.gitmodules | 3 --- vendor/DOtherSide/vendor/SortFilterProxyModel | 1 - 2 files changed, 4 deletions(-) delete mode 160000 vendor/DOtherSide/vendor/SortFilterProxyModel diff --git a/vendor/DOtherSide/.gitmodules b/vendor/DOtherSide/.gitmodules index 59b9688477..e69de29bb2 100644 --- a/vendor/DOtherSide/.gitmodules +++ b/vendor/DOtherSide/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vendor/SortFilterProxyModel"] - path = vendor/SortFilterProxyModel - url = https://github.com/status-im/SortFilterProxyModel.git diff --git a/vendor/DOtherSide/vendor/SortFilterProxyModel b/vendor/DOtherSide/vendor/SortFilterProxyModel deleted file mode 160000 index 6a471f1bef..0000000000 --- a/vendor/DOtherSide/vendor/SortFilterProxyModel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6a471f1bef1288407751400d93b12b7fa911474d