github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.reference

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11630 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-12-26 10:27:00 +00:00
parent 6e6c204f1e
commit 036f42e17f
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reference/Topic/app.tpp/all.i
View file

@ -2,16 +2,7 @@ TOPIC("main_en-us")
#include "main_en-us.tppi"
END_TOPIC
<<<<<<< .mine
TOPIC("main_en-us")
#include "main_en-us.tppi"
END_TOPIC
TOPIC("page2$en-us")
#include "page2$en-us.tppi"
=======
TOPIC("page2_en-us")
#include "page2_en-us.tppi"
>>>>>>> .r11549
END_TOPIC