From 4d46becbf3cd87c82e1347166f78742613b56eca Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 26 Dec 2017 10:26:21 +0000
Subject: [PATCH] .reference

git-svn-id: svn://ultimatepp.org/upp/trunk@11628 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 reference/Topic/app.tpp/all.i | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/reference/Topic/app.tpp/all.i b/reference/Topic/app.tpp/all.i
index 61305e980..d13920602 100644
--- a/reference/Topic/app.tpp/all.i
+++ b/reference/Topic/app.tpp/all.i
@@ -2,7 +2,16 @@ TOPIC("main_en-us")
 #include "main_en-us.tppi"
 END_TOPIC
 
-TOPIC("page2_en-us")
-#include "page2_en-us.tppi"
+<<<<<<< .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