diff options
| author | lhchavez <lhchavez@lhchavez.com> | 2019-01-15 00:42:14 +0000 |
|---|---|---|
| committer | lhchavez <lhchavez@lhchavez.com> | 2019-01-15 00:42:14 +0000 |
| commit | 7a43a892860e09fe9bef30676d70768574dfd9aa (patch) | |
| tree | d5d32e25b45132dfde69daf140c498a190268641 /tests/resources/merge-resolve/conflicting.txt | |
| parent | 2c795807f76336ad0333f2ee74022b9582710576 (diff) | |
| download | libgit2-7a43a892860e09fe9bef30676d70768574dfd9aa.tar.gz | |
Convert tests/resources/push.sh to LF endings
This changes that file to use UNIX line-endings, which makes sense since
this is a UNIXy file.
Diffstat (limited to 'tests/resources/merge-resolve/conflicting.txt')
0 files changed, 0 insertions, 0 deletions