chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitlab.com:chriscochrun/dotfiles

Browse source
This commit is contained in:
Chris Cochrun 2021-05-17 06:21:53 -05:00
commit ae2ad7dd9d
10 changed files with 35 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
qutebrowser/qsettings/QtProject.conf
View file

@ -1,7 +1,12 @@
[FileDialog]
="======"
<<<<<<< HEAD
history=file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads, file:///home/chris/Documents/TFC Stuff/newsletterpics
lastVisited=file:///home/chris/Downloads
=======
history=file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads
lastVisited=file:///home/chris
>>>>>>> 17d2a373e69612d8bf761a1f3cec3ff1ee866f2a
qtVersion=5.15.2
shortcuts=file:, file:///home/chris
sidebarWidth=116