Skip to content

Commit

Permalink
chore: Fix bad merges
Browse files Browse the repository at this point in the history
  • Loading branch information
jpmckinney committed Jul 10, 2024
1 parent 8cbc85c commit 76dc88f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 1 addition & 6 deletions docs/history/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,11 @@ Per the [normative and non-normative content and changes policy](../governance/n

* `unitClassificationScheme.csv`:
* [#1689](https://github.com/open-contracting/standard/pull/1689) Update the instructions on how to find identifiers within the QUDT scheme.
* [#1702](https://github.com/open-contracting/standard/pull/1702) Add a `Source` column.

* `tenderStatus`, `awardStatus` and `contractStatus`:
* [#1509](https://github.com/open-contracting/standard/pull/1509) [#1658](https://github.com/open-contracting/standard/pull/1658) Clarify semantics and deprecate codes.

* `relatedProcess.csv`:
* [#1645](https://github.com/open-contracting/standard/pull/1645) Deprecate "parent-to-child" codes: 'subContract', 'replacementProcess' and 'renewalProcess'
* [#1670](https://github.com/open-contracting/standard/pull/1670) Deprecate 'parent' code, because a subcontract needs to be described within its main contract, not within a separate contracting process
* [#1645](https://github.com/open-contracting/standard/pull/1645) Update descriptions: 'prior', 'framework', 'unsuccessfulProcess'
* [#1702](https://github.com/open-contracting/standard/pull/1702) Correct broken urls in `classificationScheme` and add Source column to `unitClassificationScheme`

* [#1200](https://github.com/open-contracting/standard/pull/1200) Deprecate the `submissionMethod` codelist, because its codes were either not submission methods, or not supported by use cases.
* [#1389](https://github.com/open-contracting/standard/pull/1389) Deprecate the `initiationType` codelist, because the approach to data modelling that it supports was not pursued.
* [#1209](https://github.com/open-contracting/standard/pull/1209) Replace "electronic goods" with "digital goods" in the description of 'goods' from the `procurementCategory` codelist, to align with the description in the World Trade Organization's Agreement on Government Procurement, and to avoid confusion between electronic goods like computers and digital goods like software.
Expand Down
2 changes: 1 addition & 1 deletion schema/codelists/unitClassificationScheme.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Code,Title,Description,Source
UNCEFACT,UN/CEFACT Recommendation 20,Use the common code from the latest version of the UN/CEFACT Recommendation 20 list of 'Codes for Units of Measure Used in International Trade'.,https://unece.org/trade/uncefact/cl-recommendations
UNCEFACT,UN/CEFACT Recommendation 20,"Use the common code from the latest version of the UN/CEFACT Recommendation 20 list of ""Codes for Units of Measure Used in International Trade"".",https://unece.org/trade/uncefact/cl-recommendations
QUDT,"Quantities, Units, Dimensions and Data Types Ontologies","Use the unqualified name from the QUDT Units Vocabulary: for example, 'KiloGM'.",https://www.qudt.org

0 comments on commit 76dc88f

Please sign in to comment.