Merge conflicts Part 2

pragrawa · pragrawa · commit 06ea5d7bd323 · 2016-04-27T20:37:20.000+05:30
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/RetentionPolicyConversions.cs
@@ -332,8 +332,6 @@ private static WeeklyRetentionFormat GetPSLTRWeeklyRetentionFormat(
 
         #endregion
 
-        #region PStoHydraObject conversions
-
         #region PStoServiceClientObject conversions
         // <summary>
         /// Helper function to convert service long term retention policy from ps retention policy.
