Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
kflemin committed Mar 12, 2020
2 parents 0c6ee0f + aff6e52 commit e4e15e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<auc:BuildingSync xmlns:auc="http://buildingsync.net/schemas/bedes-auc/2019" xsi:schemaLocation="http://buildingsync.net/schemas/bedes-auc/2019 https://github.com/BuildingSync/schema/releases/download/v2.0-pr1/BuildingSync.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<auc:Facilities>
<auc:Facility>
<auc:Facility ID="Facility1">
<auc:Sites>
<auc:Site ID="Site1">
<auc:PremisesIdentifiers>
Expand Down Expand Up @@ -135,16 +135,14 @@
<auc:Scenario ID="Baseline">
<auc:ScenarioName>Baseline</auc:ScenarioName>
<auc:ScenarioType>
<auc:PackageOfMeasures>
<auc:ReferenceCase IDref="Baseline"/>
<auc:PackageOfMeasures ID="PoM1">
</auc:PackageOfMeasures>
</auc:ScenarioType>
</auc:Scenario>
<auc:Scenario ID="Scenario1">
<auc:ScenarioName>LED Only</auc:ScenarioName>
<auc:ScenarioType>
<auc:PackageOfMeasures>
<auc:ReferenceCase IDref="Baseline"/>
<auc:PackageOfMeasures ID="PoM2">
<auc:MeasureIDs>
<auc:MeasureID IDref="Measure1"/>
</auc:MeasureIDs>
Expand All @@ -157,7 +155,7 @@
</auc:LinkedPremises>
<auc:UserDefinedFields>
<auc:UserDefinedField>
<auc:FieldName>Recommendation Category</auc:FieldName>
<auc:FieldName>Recommended Resource Savings Category</auc:FieldName>
<auc:FieldValue>Potential Capital Recommendations</auc:FieldValue>
</auc:UserDefinedField>
</auc:UserDefinedFields>
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==2.1.14
Django==2.2.10
django-bootstrap3==10.0.1
djangorestframework==3.9.1
djangorestframework-xml==1.0.1
Expand Down

0 comments on commit e4e15e8

Please sign in to comment.