Merge pull request #6 from TomasVotruba/patch-1

Add prefix to avoid conflicts [closes nicwortel#1]
qarrikorab · Mar 4, 2016 · 5f566b3 · 5f566b3
2 parents 597ebb9 + 157ed8b
commit 5f566b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/symfony.xml → templates/knp_symfony.xml b/templates/symfony.xml → templates/knp_symfony.xml
@@ -544,4 +544,4 @@
       <option name="OTHER" value="false" />
     </context>
   </template>
-</templateSet>
+</templateSet>