We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 06b5a05 commit 2a902f9Copy full SHA for 2a902f9
files/system/etc/hostname
@@ -0,0 +1 @@
1
+origami
recipes/recipe.yml
@@ -96,7 +96,10 @@ modules:
96
97
- type: script
98
snippets:
99
+<<<<<<< HEAD
100
- echo "origami" > /etc/hostname
101
+=======
102
+>>>>>>> 0d71500 (update hostname)
103
- git clone https://github.com/vinceliuice/WhiteSur-icon-theme.git /tmp/WhiteSur-icon-theme
104
- /tmp/WhiteSur-icon-theme/install.sh -b -a
105
- rm -rf /tmp/WhiteSur-icon-theme
0 commit comments