search

jamf / PPPC-Utility

Privacy Preferences Policy Control (PPPC) Utility
MIT License
748 stars 54 forks source link

Feature/sites #17

Closed adku closed 4 years ago

adku commented 5 years ago

Done: https://github.com/jamf/PPPC-Utility/issues/12

macblazer commented 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.

adku commented 4 years ago

@macblazer Resolved conflicts and adjusted storyboard