← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~harlowja/cloud-init:update-configobj into cloud-init:master


Joshua Harlow has proposed merging ~harlowja/cloud-init:update-configobj into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
Your team cloud init development team is requested to review the proposed merge of ~harlowja/cloud-init:update-configobj into cloud-init:master.
diff --git a/requirements.txt b/requirements.txt
index cc1dc05..ebadda2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,11 @@ oauthlib
 # that the built-in config parser is not sufficent (ie
 # when we need to preserve comments, or do not have a top-level
 # section)...
+<<<<<<< requirements.txt
+>>>>>>> requirements.txt
 # All new style configurations are in the yaml format