Added Lodel/settings/migrations.py that I forget Disabled the --merge option that was given to the makemigrations command by the MH
|
|
||
77 |
|
77 |
|
78 |
|
78 |
|
79 |
|
79 |
|
|
80 |
|
|
|
81 |
|
|
|
82 |
|
|
80 |
|
83 |
|
81 |
|
84 |
|
82 |
|
85 |
|
|
|
||
98 |
|
101 |
|
99 |
|
102 |
|
100 |
|
103 |
|
101 |
|
|
|
|
104 |
|
|
|
105 |
|
|
102 |
|
106 |
|
103 |
|
107 |
|
104 |
|
108 |
|
|
|
||
131 |
|
135 |
|
132 |
|
136 |
|
133 |
|
137 |
|
|
138 |
|
|
134 |
|
139 |
|
135 |
|
140 |
|
136 |
|
141 |
|
|
|
||
118 |
|
118 |
|
119 |
|
119 |
|
120 |
|
120 |
|
121 |
|
|
|
|
121 |
|
|
|
||
|
1 |
|
|
|
2 |
|
|
|
3 |
|
|
|
4 |
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
|
|
|
||
9 |
|
9 |
|
10 |
|
10 |
|
11 |
|
11 |
|
12 |
|
|
|
13 |
|
|
|
|
12 |
|
|
|
13 |
|
|
14 |
|
14 |
|
15 |
|
15 |
|
16 |
|
16 |
|