corregir errores al resolver conflictos

app/models/Outcome.php

@@ -319,9 +319,7 @@ class Outcome extends Eloquent
 
 			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

@@ -218,9 +218,7 @@ class Program extends Eloquent
 			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;
@@ -308,9 +306,7 @@ class Program extends Eloquent
 			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;