Completed
Pull Request — development (#910)
by
unknown
48s
created
htdocs/lib2/logic/attribute.class.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -169,18 +169,18 @@
 block discarded – undo
169 169
     public static function getConflictingAttribIds($attribId): array
170 170
     {
171 171
         static $conflicts = [
172
-            [1, 38],    // only at night - 24/7
173
-            [1, 40],    // only at night - only by day
174
-            [24, 25],   // near the parking area - long walk
175
-            [24, 27],   // near the parking area - hilly area
176
-            [24, 29],   // near the parking area - swimming required
177
-            [24, 50],   // near the parking area - cave equipment
178
-            [24, 51],   // near the parking area - diving equipment
179
-            [24, 52],   // near the parking area - watercraft
180
-            [38, 39],   // 24/7 - only at specified times
181
-            [38, 40],   // 24/7 - only by day
182
-            [42, 43],   // all seasons - breeding season
183
-            [42, 60],    // all seassons - only during specified seasons
172
+            [1, 38], // only at night - 24/7
173
+            [1, 40], // only at night - only by day
174
+            [24, 25], // near the parking area - long walk
175
+            [24, 27], // near the parking area - hilly area
176
+            [24, 29], // near the parking area - swimming required
177
+            [24, 50], // near the parking area - cave equipment
178
+            [24, 51], // near the parking area - diving equipment
179
+            [24, 52], // near the parking area - watercraft
180
+            [38, 39], // 24/7 - only at specified times
181
+            [38, 40], // 24/7 - only by day
182
+            [42, 43], // all seasons - breeding season
183
+            [42, 60], // all seassons - only during specified seasons
184 184
         ];
185 185
 
186 186
         static $conflictsByAttr = [];
Please login to merge, or discard this patch.