Merge remote-tracking branch 'origin/master' (6f2099b4) · Commits · Field Science / Field Day · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

Field Day
- Activity
- Members
- Labels
- Releases
- Package Registry
- Terraform modules
- Incidents

Snippets Groups Projects

6f2099b4

Commit 6f2099b4 authored 5 years ago by

Xunfei

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/fieldscience/cs/earlham/edu/fieldday/ReadingsDatabase.java

parents 086fc078 7cc76a06

Branches

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

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 deletions

app/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

with 75 additions and 21 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment