resolve merge conflicts

TremaMiguel · TremaMiguel · commit 3f72228b0cd3 · 2022-03-11T18:24:18.000-06:00
Signed-off-by: Miguel Trejo &lt;armando.trejo.marrufo@gmail.com&gt;
diff --git a/sdk/python/feast/infra/online_stores/dynamodb.py b/sdk/python/feast/infra/online_stores/dynamodb.py
@@ -213,7 +213,9 @@ def online_read(
         online_config = config.online_store
         assert isinstance(online_config, DynamoDBOnlineStoreConfig)
         dynamodb_resource = self._get_dynamodb_resource(online_config.region)
-        table_instance = dynamodb_resource.Table(_get_table_name(config, table))
+        table_instance = dynamodb_resource.Table(
+            _get_table_name(online_config, config, table)
+        )
 
         result: List[Tuple[Optional[datetime], Optional[Dict[str, ValueProto]]]] = []
         entity_ids = [compute_entity_id(entity_key) for entity_key in entity_keys]
