Innovation, Sustainability en Diversity modellen

Model pagina's toegevoegd
Wat gebeurt er

Conflicts:
	100+ Management Models/bin/100+ Management Models.apk
	100+ Management Models/bin/AndroidManifest.xml
	100+ Management Models/bin/classes.dex
	100+ Management Models/bin/classes/com/example/app/DatabaseModels.class
	100+ Management Models/bin/classes/com/example/app/Diversity.class
	100+ Management Models/bin/classes/com/example/app/HRM.class
	100+ Management Models/bin/classes/com/example/app/HomeScreen.class
	100+ Management Models/bin/classes/com/example/app/Innovation.class
	100+ Management Models/bin/classes/com/example/app/Leadership.class
	100+ Management Models/bin/classes/com/example/app/MainActivity.class
	100+ Management Models/bin/classes/com/example/app/R$layout.class
	100+ Management Models/bin/classes/com/example/app/R$menu.class
	100+ Management Models/bin/classes/com/example/app/R$string.class
	100+ Management Models/bin/classes/com/example/app/R$style.class
	100+ Management Models/bin/classes/com/example/app/Results.class
	100+ Management Models/bin/classes/com/example/app/SplashScreen.class
	100+ Management Models/bin/classes/com/example/app/Strategy.class
	100+ Management Models/bin/classes/com/example/app/Sustainability.class
	100+ Management Models/bin/classes/com/example/app/Webpage.class
	100+ Management Models/bin/resources.ap_
	100+ Management Models/gen/com/example/app/R.java
	100+ Management Models/src/com/example/app/Results.java
Mag het nu?

Ik wil syncen
Merge branch 'master' of https://github.com/ipmedt4project/projectipmedt4

Conflicts:
	100+ Management Models/bin/100+ Management Models.apk
	100+ Management Models/bin/AndroidManifest.xml
	100+ Management Models/bin/classes.dex
	100+ Management Models/bin/classes/com/example/app/Customer.class
	100+ Management Models/bin/classes/com/example/app/Diversity.class
	100+ Management Models/bin/classes/com/example/app/HRM.class
	100+ Management Models/bin/classes/com/example/app/Innovation.class
	100+ Management Models/bin/classes/com/example/app/Leadership.class
	100+ Management Models/bin/classes/com/example/app/MainActivity.class
	100+ Management Models/bin/classes/com/example/app/R$id.class
	100+ Management Models/bin/classes/com/example/app/R$layout.class
	100+ Management Models/bin/classes/com/example/app/R$menu.class
	100+ Management Models/bin/classes/com/example/app/R$string.class
	100+ Management Models/bin/classes/com/example/app/R$style.class
	100+ Management Models/bin/classes/com/example/app/Results.class
	100+ Management Models/bin/classes/com/example/app/SplashScreen.class
	100+ Management Models/bin/classes/com/example/app/Strategy.class
	100+ Management Models/bin/classes/com/example/app/Sustainability.class
	100+ Management Models/bin/classes/com/example/app/Webpage.class
	100+ Management
Models/bin/dexedLibs/android-support-v4-2e43b4fe81fd8d71bf21918c95e8ef67.jar
	100+ Management Models/bin/resources.ap_
	100+ Management Models/gen/com/example/app/R.java
	100+ Management Models/res/layout/activity_diversitymodel7.xml
	100+ Management Models/res/layout/activity_sustainabilitymodel1.xml
	100+ Management Models/src/com/example/app/DiversityMod7.java
	100+ Management Models/src/com/example/app/Results.java
	100+ Management Models/src/com/example/app/StrategyMod5.java