Merge branch 'ci' of https://github.com/mattnite/ziglings into mattnite-ci

eowyn.sh has changed, conflict resolved
2021-03-12 20:10:20 -05:00 · 2021-03-12 20:10:20 -05:00 · 9de772c74d
commit 9de772c74d
parent 83e235cf1b 45c6440bb2
2 changed files with 26 additions and 1 deletions
--- 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