Merge conflits solved
This commit is contained in:
commit
e5e5a42ae9
1 changed files with 1 additions and 1 deletions
2
cara/.gitattributes
vendored
2
cara/.gitattributes
vendored
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue