Skip to content

Commit 0f500d0

Browse files
authored
Clean up metadata handling in views.py
Remove unnecessary merge conflict markers and clean up code.
1 parent ae6d978 commit 0f500d0

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

api/views.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,9 @@ def post(self, request: Request, table: str) -> JsonLikeResponse:
248248

249249
if metadata is not None:
250250
# update/sync keywords with tags before saving metadata
251-
<<<<<<< feature-1971-add-oep-datasets
252251
# oemetadata v2 introduces datasets which are not relevant on a table level
253252
# always query for metadata["resources"][0]
254-
=======
255-
>>>>>>> develop
253+
256254
keywords = metadata["resources"][0].get("keywords", []) or []
257255
metadata["resources"][0]["keywords"] = update_tags_from_keywords(
258256
table=table_obj.name, keywords=keywords

0 commit comments

Comments
 (0)