Commit Graph

9 Commits

Author SHA1 Message Date
24c1ac387a Merge remote-tracking branch 'origin/master' 2022-04-13 18:31:59 -04:00
59f3b548c7 bug correction on construction catalogs 2022-04-13 18:31:54 -04:00
Pilar
58108b3bf0 Merge remote-tracking branch 'origin/master' 2022-04-12 09:29:09 -04:00
Pilar
1bb471cbe8 changes in PYGUIDE.md and WINDOWS_INSTALL.md 2022-04-11 19:29:29 -04:00
a273c38a45 remove nrcan construction library and fix some unit tests 2022-04-11 14:32:44 -04:00
3e03ca6f08 remove debug function 2022-04-11 12:45:00 -04:00
9287da7a66 correct merge errors 2022-04-11 12:44:23 -04:00
8b952e3254 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	catalog_factories/construction_catalog_factory.py
#	unittests/test_greenery_catalog.py
2022-04-11 12:39:45 -04:00
Pilar
4da0a42530 Modifications in readme and code of conduct 2022-04-08 18:03:35 -04:00