@@ -1,12 +1,7 @@
|
||||
{
|
||||
general = {
|
||||
<<<<<<< HEAD
|
||||
Hostname = "hakase";
|
||||
Username = "lsoriano";
|
||||
=======
|
||||
Hostname = "TEXAS";
|
||||
Username = "kenji";
|
||||
>>>>>>> parent of 3ebe0c9 (udp)
|
||||
Timezone = "America/Chicago";
|
||||
|
||||
allowUnfree = true; # allows installation of commercial apps.
|
||||
|
||||
Reference in New Issue
Block a user