Skip to content

Commit 3ecdc1b

Browse files
committed
docs: resovle the conflict
1 parent 25e3900 commit 3ecdc1b

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

user_guide_src/source/installation/upgrade_450.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,13 @@ has been removed.
119119

120120
If you extneds ``BaseModel``, implement the ``getIdValue()`` method in the child class.
121121

122-
<<<<<<< HEAD
123122
Factories
124123
=========
125124

126125
:doc:`../concepts/factories` has been changed to a final class.
127126
In the unlikely event, you have inherited the Factories, stop inheriting and
128127
copy the code into your Factories class.
129-
=======
128+
130129
Auto Routing (Legacy)
131130
=====================
132131

@@ -138,7 +137,6 @@ the filters will not be executed if the controller is not found.
138137

139138
If you have code that depends on this bug, for example if you expect global filters
140139
to be executed even for non-existent pages, please add the necessary routes.
141-
>>>>>>> 60f7e69cf4 (docs: modify the upgrade docs.)
142140

143141
Removed Deprecated Items
144142
========================

0 commit comments

Comments
 (0)