Nabin Hait 2f493731ec Fixed merge conflict

2018-03-12 15:49:59 +05:30

..

agriculture_analysis_criteria

Update agriculture_analysis_criteria.json (#12478)

2018-01-15 12:33:03 +05:30

agriculture_task

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

crop

Fixed merge conflict

2018-03-12 15:49:59 +05:30

crop_cycle

self.assertEqual

2018-02-28 21:13:51 +05:30

detected_disease

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

disease

Fixed merge conflict

2018-03-12 15:49:59 +05:30

fertilizer

self.assertEqual

2018-02-28 21:13:51 +05:30

fertilizer_content

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

land_unit

self.assertEqual

2018-02-28 21:13:51 +05:30

linked_land_unit

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

linked_plant_analysis

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

linked_soil_analysis

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

linked_soil_texture

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

plant_analysis

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

plant_analysis_criteria

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

soil_analysis

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

soil_analysis_criteria

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

soil_texture

Fixed merge conflict

2018-03-12 15:49:59 +05:30

soil_texture_criteria

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

water_analysis

Fixed merge conflict

2018-03-12 15:49:59 +05:30

water_analysis_criteria

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

weather

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

weather_parameter

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

__init__.py

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30