Commits

Matthew Turk committed 7c173ac

I missed these markers for merge conflicts.

Comments (0)

Files changed (1)

src/clib/chemistry_data.h

 
   gr_int UVbackground;
 
-<<<<<<< local
-  double TimeFieldLastUpdated;
-  int  RadiationShield;
-=======
   char *UVbackground_file;
->>>>>>> other
 
   struct UVBtable {
     gr_int Nz;