php monitor pause

Author: qiangicy

RESTful service/monitor_pause.php

@@ -40,9 +40,6 @@ function monitor_update($account_access_key, $account_access_secret, $stream_id,
 $account_access_secret = '<account_access_secret>';
 $stream_id = '<stream_id>';
 $action_type = 'pause'; // pause or restart
-<<<<<<< HEAD
-=======
 
->>>>>>> 0aa02a8508daaf6282a397c67ea9c50cdba39e8b
 monitor_update($account_access_key, $account_access_secret, $stream_id, $action_type);
 ?>