{{foreach $conflicts['template'] as $key => $data}}
{$data['conflict_app']}/{$data['conflict_location']}/{$data['conflict_path']}/{$data['conflict_name']}
{lang="theme_conflict_old_version"} |
{lang="theme_conflict_new_version"} |
{$data['diff']|raw}
{{endforeach}}
{{foreach $conflicts['css'] as $key => $data}}
{$data['conflict_app']}/{$data['conflict_location']}/{$data['conflict_path']}/{$data['conflict_name']}
{lang="theme_conflict_old_version"} |
{lang="theme_conflict_new_version"} |
{$data['diff']|raw}
{{endforeach}}