corregir errores al resolver conflictos

app/models/Outcome.php

 
 			if ($students_attempted) {
 				$percentage_students_who_achieved = 100.0 * $students_achieved / $students_attempted;
-			} else {
-				$percentage_students_who_achieved = 0;
-			}
+			} 
 			else
 			{
 				$percentage_students_who_achieved=0;

app/models/Program.php

 			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
 				if ($students_attempted_n) {
 					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
-				} else {
-					$percentage_students_who_achieved = 0;
-				}
+				} 
 				else
 				{
 					$percentage_students_who_achieved=0;
 			foreach ($students_attempted as $criteria_id => $students_attempted_n) {
 				if ($students_attempted_n) {
 					$percentage_students_who_achieved = 100.0 * $students_achieved[$criteria_id] / $students_attempted[$criteria_id];
-				} else {
-					$percentage_students_who_achieved = 0;
-				}
+				} 
 				else
 				{
 					$percentage_students_who_achieved=0;