Skip to content

Commit

Permalink
resolve conflicts with master
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Weirich <matthias.weirich@selectcode.de>
  • Loading branch information
vavido committed Feb 11, 2021
1 parent 871d713 commit aa62bbb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions javascript/lib/api/tests/model/things.model.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const thingObj = {
const thingObjWithoutMetadata = {
attributes,
thingId: 'Testspace:Testthing',
definition: 'example:test:definition',
policyId: 'PolicyId',
features: featuresObj,
_revision: 0,
Expand Down

0 comments on commit aa62bbb

Please sign in to comment.