Update environment.rb

app/models/environment.rb

@@ -137,25 +137,16 @@ class Environment < ActiveRecord::Base
     end
   end
 
-<<<<<<< HEAD
   def deployment_service_ready?
-    project.deployment_service.present? && available? && last_deployment.present?
+    project.deployment_platform.present? && available? && last_deployment.present?
   end
 
   def terminals
-    project.deployment_service.terminals(self) if deployment_service_ready?
+    project.deployment_platform.terminals(self) if deployment_service_ready?
   end
 
   def rollout_status
     project.deployment_service.rollout_status(self) if deployment_service_ready?
-=======
-  def has_terminals?
-    project.deployment_platform.present? && available? && last_deployment.present?
-  end
-
-  def terminals
-    project.deployment_platform.terminals(self) if has_terminals?
->>>>>>> upstream/master
   end
 
   def has_metrics?