Merge branch 'master' of https://lab.neuronfarm.net/nomad/wiki-system.wiki

2020-06-26 08:00:39 +02:00
parent 20049e4093 56673ad2f4
commit a67145f779
6 changed files with 237 additions and 170 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Xubuntu on XPS 13 7390 2 in 1 
 ## sources
 * [Gentoo wiki -  Dell XPS 13 2-in-1 (7390)](https://wiki.gentoo.org/wiki/Dell_XPS_13_2-in-1_(7390))  
@@ -103,4 +104,4 @@ select a font face that supports a larger font size, for instance the Terminus f
 apt install iio-sensor-proxy
 ~~~

-install : screen rotator : https://github.com/GuLinux/ScreenRotator
+install : screen rotator : https://github.com/GuLinux/ScreenRotator