Fixes merge conflict unexpected behavior when compiling new notification API classes
Fixes merge conflict unexpected behavior when compiling new notification API classes

madeatsampa/MacMagazine-iOS,madeatsampa/MacMagazine-iOS