A lot of laptop changes

This commit is contained in:
Chris Cochrun 2021-05-12 09:25:43 -05:00
parent daf130a30a
commit 99fc0cf593
10 changed files with 29 additions and 30 deletions

View file

@ -1,11 +1,7 @@
[FileDialog]
<<<<<<< HEAD
history=file:///home/chris/Videos/vimeo, file:///home/chris/Pictures/tfc, file:///home/chris/Pictures, file:///home/chris/Videos, file:///home/chris, file:///home/chris/Downloads
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/Pictures
>>>>>>> 7178f581f46a6fbcfa03c256db5fbed1afc2faa5
lastVisited=file:///home/chris
qtVersion=5.15.2
shortcuts=file:, file:///home/chris
sidebarWidth=116