extern/dotfiles
1
0
Fork 0
mirror of https://github.com/Lissy93/dotfiles.git synced 2024-11-25 00:43:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict

Browse Source
This commit is contained in:
Alicia Sykes 2022-12-19 20:46:56 +00:00
parent 35f9ea4b38
commit 38a2c2a9b9
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/qr-code.sh
View File

@ -21,14 +21,8 @@ getConfiguredClient () {
fi fi
} }
<<<<<<< HEAD
## Allows to call the users configured client without if statements everywhere
httpGet()
{
=======
# Call appropriate http get method # Call appropriate http get method
httpGet() { httpGet() {
>>>>>>> fe6ffbba54ca34778e1f4245466e1efc3394b896
case "$configuredClient" in case "$configuredClient" in
curl) curl -A curl -s "$@" ;; curl) curl -A curl -s "$@" ;;
wget) wget -qO- "$@" ;; wget) wget -qO- "$@" ;;