Merge remote-tracking branch 'origin/master'
# Conflicts: # app/src/main/java/fieldscience/cs/earlham/edu/fieldday/ReadingsDatabase.java
Showing
- .idea/caches/gradle_models.ser 0 additions, 0 deletions.idea/caches/gradle_models.ser
- .idea/codeStyles/Project.xml 29 additions, 0 deletions.idea/codeStyles/Project.xml
- app/build.gradle 2 additions, 2 deletionsapp/build.gradle
- app/src/main/java/fieldscience/cs/earlham/edu/fieldday/DatabaseActionsActivity.java 9 additions, 2 deletions...ence/cs/earlham/edu/fieldday/DatabaseActionsActivity.java
- app/src/main/java/fieldscience/cs/earlham/edu/fieldday/ReadingsDatabase.java 21 additions, 15 deletions...ieldscience/cs/earlham/edu/fieldday/ReadingsDatabase.java
- app/src/main/java/fieldscience/cs/earlham/edu/fieldday/SensorSampleActivity.java 3 additions, 0 deletions...science/cs/earlham/edu/fieldday/SensorSampleActivity.java
- app/src/main/java/fieldscience/cs/earlham/edu/fieldday/SensorSampleService.java 2 additions, 0 deletions...dscience/cs/earlham/edu/fieldday/SensorSampleService.java
- app/src/main/java/fieldscience/cs/earlham/edu/fieldday/aSensor.java 9 additions, 2 deletions...in/java/fieldscience/cs/earlham/edu/fieldday/aSensor.java
Please register or sign in to comment