=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2015-02-26 15:21:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2015-03-12 07:39:04 +0000
@@ -568,8 +568,7 @@
         return programAttributes;
     }
 
-    public void setProgramAttributes(
-        List<ProgramTrackedEntityAttribute> programAttributes )
+    public void setProgramAttributes( List<ProgramTrackedEntityAttribute> programAttributes )
     {
         this.programAttributes = programAttributes;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java	2015-03-12 07:39:04 +0000
@@ -126,7 +126,6 @@
                 {
                     program.getProgramAttributes().remove( programAttribute );
                     programService.updateProgram( program );
-                    break;
                 }
             }
         }