The battle over a pride flag between the city of Long Beach and the boardwalk restaurant Riptides has ended with both sides coming to an agreement.

As News 12 has reported, the controversy started Sunday when the LGBT Network held a rally claiming the city was homophobic because officials ordered the pride flag be removed from the boardwalk. 

City officials say the flag violated city code.

MORE: Long Beach defends decision to remove pride flag from boardwalk

As part of the agreement, all flags on display will be mounted directly on the snack shack instead.

City Council Vice President Karen McInnis calls this a win for both the restaurant and Long Beach.

"This means we'll be working together in a partnership where Riptides is an important member of this community and very well-loved establishment," says McInnis. "They will be able to serve residents and any beachgoers. And the city will be able to stay in compliance with its rules and regulations."

Riptides will also be allowed to have additional tables on the boardwalk for an added fee as part of the deal.