# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1595171414 14400
# Node ID b0c1c5bcfc3b15e7e4c02e03667ef1909ae2e8c0
# Parent  7514d616f50275d26fe7e7bc682955fe89dd473d# Parent  6f0af1e0b0c9720a77c104498bb3591d6bb0715e
Merge.

diff -r 6f0af1e0b0c9 -r b0c1c5bcfc3b .hgsubstate
diff -r 6f0af1e0b0c9 -r b0c1c5bcfc3b restic/excludes.txt
--- a/restic/excludes.txt	Mon Jul 13 11:52:11 2020 -0400
+++ b/restic/excludes.txt	Sun Jul 19 11:10:14 2020 -0400
@@ -31,4 +31,6 @@
 /home/sjl/src/abcl
 /home/sjl/src/arduino
 /home/sjl/src/dotfiles/vim/tmp
+/home/sjl/Pictures/Webcam
+/home/sjl/Pictures/darktable_export
 cache2
diff -r 6f0af1e0b0c9 -r b0c1c5bcfc3b servers/bin/freqs
--- a/servers/bin/freqs	Mon Jul 13 11:52:11 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/freqs
\ No newline at end of file
diff -r 6f0af1e0b0c9 -r b0c1c5bcfc3b servers/bin/hist
--- a/servers/bin/hist	Mon Jul 13 11:52:11 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/hist
\ No newline at end of file
diff -r 6f0af1e0b0c9 -r b0c1c5bcfc3b servers/bin/props
--- a/servers/bin/props	Mon Jul 13 11:52:11 2020 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../../bin/props
\ No newline at end of file