Commit 2e3a983a authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

do not confuse git merge

parent 3fb1edfe

sources/read_data.f90

+2 −1
Original line number Diff line number Diff line
@@ -684,8 +684,9 @@ contains 
      if (i>0) physics%sample_angle = &

           value_struct(VAL_NO_ERROR, deg2rad(technical%motor(i)%value), 0.0)



      i = size(config%monitors)

      physics%detector    = config%detector



      i = size(config%monitors)

      physics%monitors(1:i)  = config%monitors(1:i)

      physics%no_monitors    = i