From: Roland Scheidegger <sroland@vmware.com>
Date: Mon, 21 Dec 2009 17:20:31 +0000 (+0100)
Subject: python: fix some pipe_format_simplify merge damage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f1d2ab590432dd6254f2e124a874695c8e87aae;p=mesa.git

python: fix some pipe_format_simplify merge damage
---

diff --git a/src/gallium/state_trackers/python/p_device.i b/src/gallium/state_trackers/python/p_device.i
index fb793d5cbd8..2dc995adb07 100644
--- a/src/gallium/state_trackers/python/p_device.i
+++ b/src/gallium/state_trackers/python/p_device.i
@@ -112,10 +112,6 @@ struct st_device {
       struct pipe_texture templat;
       memset(&templat, 0, sizeof(templat));
       templat.format = format;
-<<<<<<< HEAD
-      util_format_get_block(templat.format, &templat.block);
-=======
->>>>>>> master
       templat.width0 = width;
       templat.height0 = height;
       templat.depth0 = depth;