From a1e275c0dd0a2676d378222e1b0d31de0f3eac4d Mon Sep 17 00:00:00 2001
From: Pedram Navid <1045990+PedramNavid@users.noreply.github.com>
Date: Wed, 14 Aug 2024 13:27:48 -0700
Subject: [PATCH] revert assets

---
 python_modules/dagster/dagster/_core/definitions/assets.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python_modules/dagster/dagster/_core/definitions/assets.py b/python_modules/dagster/dagster/_core/definitions/assets.py
index 81e11e0d3a935..58f78f11ac95d 100644
--- a/python_modules/dagster/dagster/_core/definitions/assets.py
+++ b/python_modules/dagster/dagster/_core/definitions/assets.py
@@ -1403,7 +1403,6 @@ def _output_to_source_asset(self, output_name: str) -> SourceAsset:
 
     @public
     def get_asset_spec(self, key: Optional[AssetKey] = None) -> AssetSpec:
-<<<<<<< HEAD
         """Returns a representation of this asset as an :py:class:`AssetSpec`.
 
         If this is a multi-asset, the "key" argument allows selecting which asset to return the