fixing merge conflict
This commit is contained in:
commit
83fd8546ca
2
aif.xml
2
aif.xml
@ -53,8 +53,10 @@
|
||||
</software>
|
||||
</pacman>
|
||||
<bootloader type="grub" target="/boot" efi="true" />
|
||||
<scripts>
|
||||
<script uri="https://aif.square-r00t.net/sample-scripts/post/first.sh" order="1" bootstrap="0" />
|
||||
<script uri="https://aif.square-r00t.net/sample-scripts/pre/second.pl" order="2" bootstrap="1" />
|
||||
<script uri="https://aif.square-r00t.net/sample-scripts/pre/first.sh" order="1" bootstrap="1" />
|
||||
<script uri="https://aif.square-r00t.net/sample-scripts/post/second.py" order="2" bootstrap="0" />
|
||||
</scripts>
|
||||
</aif>
|
||||
|
Loading…
Reference in New Issue
Block a user