Merge conflits solved

This commit is contained in:
Luis Aleixo 2021-08-04 12:33:38 +02:00
commit e5e5a42ae9

2
cara/.gitattributes vendored
View file

@ -1,2 +1,2 @@
global_weather_set.json filter=lfs diff=lfs merge=lfs -text
hadisd_station_fullinfo_v311_202001p.txt filter=lfs diff=lfs merge=lfs -text
hadisd_station_fullinfo_v311_202001p.txt filter=lfs diff=lfs merge=lfs -text