diff options
author | Dave Gauer <dave@ratfactor.com> | 2021-03-12 20:10:20 -0500 |
---|---|---|
committer | Dave Gauer <dave@ratfactor.com> | 2021-03-12 20:10:20 -0500 |
commit | 9de772c74d71e24187b7f3cc183ed8f53dfee374 (patch) | |
tree | 6236fe8a011e92f5d7fb0fb74d5787473f594827 /patches/eowyn.sh | |
parent | 83e235cf1bf87ec00af67d0d3ab63ba9cc329344 (diff) | |
parent | 45c6440bb2566a0263d4ceeee5bfd2e4fe1f07a8 (diff) | |
download | ziglings-9de772c74d71e24187b7f3cc183ed8f53dfee374.tar.gz ziglings-9de772c74d71e24187b7f3cc183ed8f53dfee374.tar.bz2 ziglings-9de772c74d71e24187b7f3cc183ed8f53dfee374.tar.xz ziglings-9de772c74d71e24187b7f3cc183ed8f53dfee374.zip |
Merge branch 'ci' of https://github.com/mattnite/ziglings into mattnite-ci
eowyn.sh has changed, conflict resolved
Diffstat (limited to 'patches/eowyn.sh')
-rwxr-xr-x | patches/eowyn.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/eowyn.sh b/patches/eowyn.sh index 1ff3f75..a30a67a 100755 --- a/patches/eowyn.sh +++ b/patches/eowyn.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # "I will be a shieldmaiden no longer, # nor vie with the great Riders, nor |