fix: Merge issue in 00-XFEL.py

bam/settings/00-XFEL.py

@@ -104,6 +104,8 @@ TIMER_LOCATION.update({
     '2461.S1'  : 'SD2461S1',
     '2423.S2'  : 'SD2423S2',
     '2955.S3'  : 'SD2955S3',
+})
+
 MOTOR_CONVERSION_FACTOR.update({
     '47.I1'    : [1.04230668925927, 1.04230668925927, 4.957000e-01, 4.957000e-01],
     '181.B1'   : [1.04230668925927, 1.04230668925927, 4.995900e-01, 4.995900e-01],