pulled yoga2

2019-05-03 02:20:07 +00:00
parent 89b812c0dd 2f6f026bc6
commit ffc562affa
27 changed files with 566 additions and 136 deletions
@@ -1,2 +1,6 @@
 #!/bin/bash
+<<<<<<< HEAD
 exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache"
+=======
+exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache/chrome"
+>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898