secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gtk] Fixes merge conflict in servers file

Browse Source
This commit is contained in:
Colin Powell
2025-03-28 16:20:29 -04:00
parent bfb8b2bd94
commit f5a639ed07
1 changed files with 0 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
gtk/.config/gtk-3.0/servers
View File

@ -23,86 +23,4 @@
</metadata> </metadata>
</info> </info>
</bookmark> </bookmark>
<<<<<<< Updated upstream
</xbel> </xbel>
||||||| Stash base
<bookmark href="sftp://sftp-67185@sftp.cloud100.15five.com/" added="2022-07-20T20:12:04.230320Z" modified="2022-09-09T13:39:44.284443Z" visited="2022-09-09T13:39:44.284435Z">
<title>/ on sftp.cloud100.15five.com</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-09-09T13:39:44.284438Z" count="4"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://sftp.cloud100.15five.com/" added="2022-07-20T20:12:40.174096Z" modified="2022-07-20T20:12:40.174101Z" visited="2022-07-20T20:12:40.174098Z">
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-07-20T20:12:40.174099Z" count="1"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://sftp-65945@sftp.cloud100.15five.com/" added="2022-09-09T17:05:09.135701Z" modified="2022-09-09T17:06:47.911504Z" visited="2022-09-09T17:06:47.911491Z">
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-09-09T17:06:47.911497Z" count="2"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
</xbel>
=======
<bookmark href="sftp://sftp-67185@sftp.cloud100.15five.com/" added="2022-07-20T20:12:04.230320Z" modified="2022-09-09T13:39:44.284443Z" visited="2022-09-09T13:39:44.284435Z">
<title>/ on sftp.cloud100.15five.com</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-09-09T13:39:44.284438Z" count="4"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://sftp.cloud100.15five.com/" added="2022-07-20T20:12:40.174096Z" modified="2022-07-20T20:12:40.174101Z" visited="2022-07-20T20:12:40.174098Z">
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-07-20T20:12:40.174099Z" count="1"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://sftp-65945@sftp.cloud100.15five.com/" added="2022-09-09T17:05:09.135701Z" modified="2022-09-09T17:06:47.911504Z" visited="2022-09-09T17:06:47.911491Z">
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-09-09T17:06:47.911497Z" count="2"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://root@greip.unbl.ink/" added="2022-10-15T16:39:40.829379Z" modified="2022-10-15T16:39:40.829383Z" visited="2022-10-15T16:39:40.829380Z">
<title>/ on greip.unbl.ink</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-10-15T16:39:40.829381Z" count="1"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
<bookmark href="sftp://root@pandora.unbl.ink/" added="2022-10-15T18:10:15.616508Z" modified="2022-10-15T18:10:15.616511Z" visited="2022-10-15T18:10:15.616509Z">
<title>/ on pandora.unbl.ink</title>
<info>
<metadata owner="http://freedesktop.org">
<bookmark:applications>
<bookmark:application name="org.gnome.Nautilus" exec="&apos;org.gnome.Nautilus %u&apos;" modified="2022-10-15T18:10:15.616510Z" count="1"/>
</bookmark:applications>
</metadata>
</info>
</bookmark>
</xbel>
>>>>>>> Stashed changes