-
Lucas Braz Cunha authored# Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/br/ufpr/c3sl/agendador/agendador/HomeActivity.java # app/src/main/java/br/ufpr/c3sl/agendador/agendador/SchedulingActivity.java # app/src/main/res/layout/appbar_home.xml # app/src/main/res/layout/content_scheduling.xml # app/src/main/res/values/strings.xml
3ed09781