Closed stevenlujpl closed 2 years ago
@wkiri This is the PR to merge the changes in issue9-aliases to the master branch. There is a merge conflict in the PDS4 bundle readme.txt file that I am not sure how to resolve. Do you mind taking a look and resolving that merge conflict?
issue9-aliases
master
@youlu These changes look good to me! I've resolved the merge conflict. Please go ahead and merge.
@wkiri This is the PR to merge the changes in
issue9-aliases
to themaster
branch. There is a merge conflict in the PDS4 bundle readme.txt file that I am not sure how to resolve. Do you mind taking a look and resolving that merge conflict?