Merge branch 'djm_branch' of https://bdgit.educoder.net/p5gy6sexf/FruitandVegetableGuide into djm_branch
# Conflicts:
# src/FruitandVegetableGuide/.idea/deploymentTargetDropDown.xml
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/README.md
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/PhotographScreen.kt
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/RecognizeResultScreen.kt
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/PhotoComponent.kt
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/SelectPicture.kt
# src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/TakePhoto.kt
|
483170596