The Huntington Beach Visitors Bureau had registered Surf City as a trademark back in 2006. The two sides have now reached a settlement with the Santa Cruz store agreeing to stop selling the shirts.
Just for the record, Jan of "Jan and Dean", who co-wrote the song "Surf City" with the Beach Boys' Brian Wilson, says the song is about Huntington Beach.
