Projects >> Infotec-College-Finder >>f2c4d7a1084ecf6a2d5dae8d67862df534553a94

Chunk
Conflicting content 
			var.add(spinnertuition.getSelectedItem().toString());
			var.add(mHouseView.getText().toString());
			var.add(spinnerregion.getSelectedItem().toString());
<<<<<<< HEAD
			var.add(spinnerSetting.getSelectedItem().toString());
			
=======

>>>>>>> 94ddd6c7a5cab6a646fdbe70453bb77bf6fbc732
			for (int i = 0; i < var.size(); i++) {
				vars[i] = var.get(i);
			}
Solution content 
			var.add(spinnertuition.getSelectedItem().toString());
			var.add(mHouseView.getText().toString());
			var.add(spinnerregion.getSelectedItem().toString());
			var.add(spinnerSetting.getSelectedItem().toString());

			for (int i = 0; i < var.size(); i++) {
				vars[i] = var.get(i);
			}
File
InfotecActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation