summaryrefslogtreecommitdiff
path: root/tidal_dl_ng/ui
diff options
context:
space:
mode:
authorRikrdoga <ricardoga@outlook.com>2025-10-21 11:45:11 -0600
committerRikrdoga <ricardoga@outlook.com>2025-10-21 11:58:34 -0600
commite266149684baf6e49462df6d758c6a5714dbfc05 (patch)
tree111e15da9f3c34687a91f7de48ca148d9cfe2451 /tidal_dl_ng/ui
parent234ed80192751fc3036e0473d2d9e6c9fc571bd7 (diff)
downloadtidal-dl-ng-e266149684baf6e49462df6d758c6a5714dbfc05.tar.gz
Move credentials to constants, improve docs (tidal_obj), and clean up Atmos legacy code
Diffstat (limited to 'tidal_dl_ng/ui')
-rw-r--r--tidal_dl_ng/ui/main.ui5
1 files changed, 0 insertions, 5 deletions
diff --git a/tidal_dl_ng/ui/main.ui b/tidal_dl_ng/ui/main.ui
index 2b6d9ac..23d98e6 100644
--- a/tidal_dl_ng/ui/main.ui
+++ b/tidal_dl_ng/ui/main.ui
@@ -671,11 +671,6 @@
</property>
<property name="icon">
<iconset theme="QIcon::ThemeIcon::MediaPlaybackPause"/>
-<<<<<<< HEAD
- <iconset theme="QIcon::ThemeIcon::MediaPlaybackStart">
- <normaloff>.</normaloff>.</iconset>
-=======
->>>>>>> 13dddc7 (Refactor Dolby Atmos feature to be internal and seamless)
</property>
</widget>
</item>