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

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

diff --git a/reference/Topic/app.tpp/all.i b/reference/Topic/app.tpp/all.i
index d13920602..61305e980 100644
--- a/reference/Topic/app.tpp/all.i
+++ b/reference/Topic/app.tpp/all.i
@@ -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