# Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java # app/src/main/res/layout/fragment_personal.xml |
||
---|---|---|
.. | ||
androidTest/java/com/android_app/matan/ara/sagi/thesocialnotework | ||
debug/res/values | ||
main | ||
release/res/values | ||
test/java/com/android_app/matan/ara/sagi/thesocialnotework |