Ordinances or parts of ordinances, and resolutions or parts of resolutions, inconsistent herewith, are hereby repealed. Ordinances or parts of ordinances, and resolutions or parts of resolutions, consistent herewith, are hereby approved and confirmed.