File tree Expand file tree Collapse file tree 1 file changed +1
-3
lines changed
user_guide_src/source/installation Expand file tree Collapse file tree 1 file changed +1
-3
lines changed Original file line number Diff line number Diff line change @@ -119,14 +119,13 @@ has been removed.
119
119
120
120
If you extneds ``BaseModel ``, implement the ``getIdValue() `` method in the child class.
121
121
122
- <<<<<<< HEAD
123
122
Factories
124
123
=========
125
124
126
125
:doc: `../concepts/factories ` has been changed to a final class.
127
126
In the unlikely event, you have inherited the Factories, stop inheriting and
128
127
copy the code into your Factories class.
129
- =======
128
+
130
129
Auto Routing (Legacy)
131
130
=====================
132
131
@@ -138,7 +137,6 @@ the filters will not be executed if the controller is not found.
138
137
139
138
If you have code that depends on this bug, for example if you expect global filters
140
139
to be executed even for non-existent pages, please add the necessary routes.
141
- >>>>>>> 60f7e69cf4 (docs: modify the upgrade docs.)
142
140
143
141
Removed Deprecated Items
144
142
========================
You can’t perform that action at this time.
0 commit comments