merging

franciscojavierarceo · franciscojavierarceo · commit fd577dcc9be1 · 2024-09-29T22:49:33.000-04:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/sdk/python/feast/utils.py b/sdk/python/feast/utils.py
@@ -1141,7 +1141,6 @@ def tags_str_to_dict(tags: str = "") -> dict[str, str]:
             cast(tuple[str, str], tag.split(":", 1)) for tag in tags_list if ":" in tag
         ).items()
     }
-<<<<<<< HEAD
 
 
 def _utc_now() -> datetime:
@@ -1194,5 +1193,3 @@ def _build_retrieve_online_document_record(
         vector_value_proto,
         distance_value_proto,
     )
-=======
->>>>>>> f97a28ca (checking in progress)

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,6 @@ def tags_str_to_dict(tags: str = "") -> dict[str, str]:`
`1141`	`1141`	`cast(tuple[str, str], tag.split(":", 1)) for tag in tags_list if ":" in tag`
`1142`	`1142`	`).items()`
`1143`	`1143`	`}`
`1144`		`-<<<<<<< HEAD`
`1145`	`1144`
`1146`	`1145`
`1147`	`1146`	`def _utc_now() -> datetime:`
`@@ -1194,5 +1193,3 @@ def _build_retrieve_online_document_record(`
`1194`	`1193`	`vector_value_proto,`
`1195`	`1194`	`distance_value_proto,`
`1196`	`1195`	`)`
`1197`		`-=======`
`1198`		`->>>>>>> f97a28ca (checking in progress)`