Closed adku closed 4 years ago
@adku Do you want to resolve the conflicts on this PR? The storyboard conflict is probably simpler to just delete your changes, and recreate the changes from the master branch storyboard.
Otherwise, I can take your code changes into a branch of my own and reapply the storyboard changes.
@macblazer Resolved conflicts and adjusted storyboard
Done: https://github.com/jamf/PPPC-Utility/issues/12