Fix conflicts with recent commits (I think/hope)
Some commits this week caused some conflicts with some open pull requests made last week. I believe and hope that I fixed the conflicts.
This commit is contained in:
Cody Boone Ferguson committed
1 parent
79c7f3d1a0
commit
11bb36ac8c
21 files changed
+1
-1
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
|
||||
prog
|
||||
prog-simple
|
||||
prog.orig
|
||||
weasel
|
||||
weasel-simple
|
||||
prog
|
||||
File renamed without changes.
Reference in new issue
Block a user