Fix merge conflicts in copyright region of several files
Ethan Chappel
Branch: Deleted repository:bugfix/merge-conflicts
Branch: Isbeorn/nina:develop
Merged
Merged pull request
Merged in bugfix/merge-conflicts (pull request #1237)
Merged in bugfix/merge-conflicts (pull request #1237)
What is the purpose of this Pull Request?
Remove merge conflicts from commit 08cb8b2 that appeared in the copyright region of several files.
How were the changes tested?
Compiled successfully after removing conflicts.
Did all Unit Tests pass?
Yes
Are there relevant Issues in the tracker that this PR will fix?
Screenshots
Notes
Â