pulled yoga2

2019-05-03 02:20:07 +00:00
parent 89b812c0dd 2f6f026bc6
commit ffc562affa
27 changed files with 566 additions and 136 deletions
@@ -6,3 +6,10 @@ currently the repo is .dotfiles in ~ with symlinks from the default file to it's
 #### naming conventions
 Kernels: kernel.*machine-name* ie kernel.yoga2

+<<<<<<< HEAD
+=======
+#### Local config
+Notes on local configuration stuff are in Local-config.*machine-name* ir Local-config.yoga2
+Things included kernel cmdline, Xorg config, other customizations for working around bugs
+or hardware issues.
+>>>>>>> 2f6f026bc689f7612d2a67cfd9ae8478510dd898