Solved conflicts

Delta-Icons · Dec 9, 2021 · c36d99d · c36d99d
2 parents 61a3ab4 + 3343079
commit c36d99d
Show file tree

Hide file tree

Showing 75 changed files with 472 additions and 217 deletions.
diff --git a/app/src/main/assets/appfilter.xml b/app/src/main/assets/appfilter.xml
diff --git a/app/src/main/assets/drawable.xml b/app/src/main/assets/drawable.xml
diff --git a/app/src/main/res/drawable-nodpi/agoda.png b/app/src/main/res/drawable-nodpi/agoda.png
diff --git a/app/src/main/res/drawable-nodpi/axisnet.png b/app/src/main/res/drawable-nodpi/axisnet.png
diff --git a/app/src/main/res/drawable-nodpi/blogger.png b/app/src/main/res/drawable-nodpi/blogger.png
diff --git a/app/src/main/res/drawable-nodpi/cxxdroid.png b/app/src/main/res/drawable-nodpi/cxxdroid.png
diff --git a/app/src/main/res/drawable-nodpi/dutch_bros.png b/app/src/main/res/drawable-nodpi/dutch_bros.png
diff --git a/app/src/main/res/drawable-nodpi/gaia_gps.png b/app/src/main/res/drawable-nodpi/gaia_gps.png
diff --git a/app/src/main/res/drawable-nodpi/google_admin.png b/app/src/main/res/drawable-nodpi/google_admin.png
diff --git a/app/src/main/res/drawable-nodpi/google_jamboard.png b/app/src/main/res/drawable-nodpi/google_jamboard.png
diff --git a/app/src/main/res/drawable-nodpi/inware.png b/app/src/main/res/drawable-nodpi/inware.png
diff --git a/app/src/main/res/drawable-nodpi/kyiv_digital.png b/app/src/main/res/drawable-nodpi/kyiv_digital.png
diff --git a/app/src/main/res/drawable-nodpi/lbry.png b/app/src/main/res/drawable-nodpi/lbry.png
diff --git a/app/src/main/res/drawable-nodpi/manchester_united.png b/app/src/main/res/drawable-nodpi/manchester_united.png
diff --git a/app/src/main/res/drawable-nodpi/omlet_arcade.png b/app/src/main/res/drawable-nodpi/omlet_arcade.png
diff --git a/app/src/main/res/drawable-nodpi/op_gg.png b/app/src/main/res/drawable-nodpi/op_gg.png
diff --git a/app/src/main/res/drawable-nodpi/panera_bread.png b/app/src/main/res/drawable-nodpi/panera_bread.png
diff --git a/app/src/main/res/drawable-nodpi/panera_bread_alt.png b/app/src/main/res/drawable-nodpi/panera_bread_alt.png
diff --git a/app/src/main/res/drawable-nodpi/pikmin_bloom.png b/app/src/main/res/drawable-nodpi/pikmin_bloom.png
diff --git a/app/src/main/res/drawable-nodpi/pull_and_bear.png b/app/src/main/res/drawable-nodpi/pull_and_bear.png
diff --git a/app/src/main/res/drawable-nodpi/simple_contacts.png b/app/src/main/res/drawable-nodpi/simple_contacts.png
diff --git a/app/src/main/res/drawable-nodpi/simple_sms.png b/app/src/main/res/drawable-nodpi/simple_sms.png
diff --git a/app/src/main/res/drawable-nodpi/spike_email.png b/app/src/main/res/drawable-nodpi/spike_email.png
diff --git a/app/src/main/res/drawable-nodpi/takoboto.png b/app/src/main/res/drawable-nodpi/takoboto.png
diff --git a/app/src/main/res/drawable-nodpi/tomato_pizza.png b/app/src/main/res/drawable-nodpi/tomato_pizza.png
diff --git a/app/src/main/res/drawable-nodpi/toss.png b/app/src/main/res/drawable-nodpi/toss.png
diff --git a/app/src/main/res/drawable-nodpi/tp_link_tapo.png b/app/src/main/res/drawable-nodpi/tp_link_tapo.png
diff --git a/app/src/main/res/drawable-nodpi/unicodepad.png b/app/src/main/res/drawable-nodpi/unicodepad.png
diff --git a/app/src/main/res/drawable-nodpi/verisure.png b/app/src/main/res/drawable-nodpi/verisure.png
diff --git a/app/src/main/res/drawable-nodpi/visible.png b/app/src/main/res/drawable-nodpi/visible.png
diff --git a/app/src/main/res/drawable-nodpi/voxer.png b/app/src/main/res/drawable-nodpi/voxer.png
diff --git a/app/src/main/res/drawable-nodpi/wakanim.png b/app/src/main/res/drawable-nodpi/wakanim.png
diff --git a/app/src/main/res/drawable-nodpi/wasd.png b/app/src/main/res/drawable-nodpi/wasd.png
diff --git a/app/src/main/res/drawable-nodpi/when_i_work.png b/app/src/main/res/drawable-nodpi/when_i_work.png
diff --git a/app/src/main/res/drawable-nodpi/yandex_radio.png b/app/src/main/res/drawable-nodpi/yandex_radio.png
diff --git a/app/src/main/res/drawable-nodpi/yape.png b/app/src/main/res/drawable-nodpi/yape.png
diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml
diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml
diff --git a/app/src/main/res/xml/theme_resources.xml b/app/src/main/res/xml/theme_resources.xml
diff --git a/contributed-vectors/agoda.svg b/contributed-vectors/agoda.svg
diff --git a/contributed-vectors/axisnet.svg b/contributed-vectors/axisnet.svg
diff --git a/contributed-vectors/blogger.svg b/contributed-vectors/blogger.svg
diff --git a/contributed-vectors/cxxdroid.svg b/contributed-vectors/cxxdroid.svg
diff --git a/contributed-vectors/dutch_bros.svg b/contributed-vectors/dutch_bros.svg
diff --git a/contributed-vectors/gaia_gps.svg b/contributed-vectors/gaia_gps.svg
diff --git a/contributed-vectors/google_admin.svg b/contributed-vectors/google_admin.svg
diff --git a/contributed-vectors/google_jamboard.svg b/contributed-vectors/google_jamboard.svg
diff --git a/contributed-vectors/inware.svg b/contributed-vectors/inware.svg
diff --git a/contributed-vectors/kyiv_digital.svg b/contributed-vectors/kyiv_digital.svg
diff --git a/contributed-vectors/lbry.svg b/contributed-vectors/lbry.svg