displague commented on code in PR #1971:
URL: https://github.com/apache/libcloud/pull/1971#discussion_r1458346461


##########
libcloud/compute/drivers/equinixmetal.py:
##########
@@ -252,8 +252,12 @@ def ex_list_nodes_for_project(self, ex_project_id, 
include="plan", page=1, per_p
         return list(map(self._to_node, data))
 
     def list_locations(self):
+<<<<<<< HEAD

Review Comment:
   Bad merge - several unresolved conflicts in this PR. 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscr...@libcloud.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Reply via email to