aditya/lfs-scripts
1
0
Fork 0
mirror of https://git.adityakumar.xyz/lfs-scripts.git synced 2024-10-18 06:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflict

Browse source
This commit is contained in:
Aditya 2023-01-08 15:57:40 +05:30
commit dcf6ec549d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/main.sh
View file

@ -113,6 +113,7 @@ if [ $exit_status -ne 0 ]
then
stop_script "chapter4/4.3-add-user.sh"
fi
<<<<<<< HEAD
PWD=$(pwd)
@ -176,4 +177,3 @@ then
stop_script "chapter5/5.5-glibc.sh"
fi