Fix the merge for forge

This commit is contained in:
Christian committed 2012-10-23 18:36:05 -04:00
1 parent 6dadc1d889
commit 346691c298
1 file changed
+3 -3
+3 -3
View File
@@ -1,6 +1,6 @@
>ou >ou
>iZ >iz
>xD >xd
>xa >xa
>anh >anh
>anm >anm
@@ -17,4 +17,4 @@
<hr <hr
<hs <hs
<ht <ht
<hu <hu