Add syncthing service and updates to fish for titan

2019-07-19 09:17:18 -04:00
parent 3a85264275
commit 0c61de372b
14 changed files with 69 additions and 170 deletions
--- a/fonts/.fonts/iosevka-2.2.1/woff2/.uuid
+++ b/fonts/.fonts/iosevka-2.2.1/woff2/.uuid
@ -1 +1,7 @@
-9151d470-11e7-49d0-8506-97ce582ac744
+<<<<<<< Updated upstream
+9151d470-11e7-49d0-8506-97ce582ac744
+||||||| merged common ancestors
+c14771fc-3a4a-4e14-8d32-07582bd840bc
+=======
+cd0db777-43b9-4786-9f9d-63955587166c
+>>>>>>> Stashed changes
--- a/fonts/.local/share/fonts/.uuid
+++ b/fonts/.local/share/fonts/.uuid
@ -0,0 +1 @@
+49d94597-4c24-47d7-a0f7-027fdb232980
--- a/fonts/.local/share/fonts/all-the-icons.ttf
+++ b/fonts/.local/share/fonts/all-the-icons.ttf
--- a/fonts/.local/share/fonts/file-icons.ttf
+++ b/fonts/.local/share/fonts/file-icons.ttf
--- a/fonts/.local/share/fonts/fontawesome.ttf
+++ b/fonts/.local/share/fonts/fontawesome.ttf
--- a/fonts/.local/share/fonts/material-design-icons.ttf
+++ b/fonts/.local/share/fonts/material-design-icons.ttf
--- a/fonts/.local/share/fonts/octicons.ttf
+++ b/fonts/.local/share/fonts/octicons.ttf
--- a/fonts/.local/share/fonts/weathericons.ttf
+++ b/fonts/.local/share/fonts/weathericons.ttf