Sergio De la torre
669b05826e
# Conflicts: # .idea/deploymentTargetDropDown.xml # .idea/workspace.xml # app/build.gradle # app/src/main/java/es/verdnatura/domain/SalixService.kt # app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt # app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt # app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt # app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt # app/src/main/res/layout/fragment_packaging.xml # app/src/main/res/layout/fragment_packaging_obs.xml # app/src/main/res/layout/fragment_packaging_summary.xml # app/src/main/res/layout/item_image_row.xml # app/src/main/res/layout/item_itemsupplier_row.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| alpha/release | ||
| beta | ||
| betatesting/release | ||
| debug | ||
| release | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| escenarios.txt | ||
| google-services.json | ||
| proguard-rules.pro | ||