summaryrefslogtreecommitdiff
path: root/gnome-base/nautilus/nautilus-3.32.3.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/nautilus/nautilus-3.32.3.ebuild')
-rw-r--r--gnome-base/nautilus/nautilus-3.32.3.ebuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
index ef2cd4c4480b..3197ede8970f 100644
--- a/gnome-base/nautilus/nautilus-3.32.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild
@@ -35,8 +35,12 @@ RDEPEND="${COMMON_DEPEND}
seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+<<<<<<< HEAD
+"
+=======
>=app-misc/tracker-miners-2.0:=
" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+>>>>>>> next
DEPEND="${COMMON_DEPEND}
media-libs/fontconfig
"