python: fix some pipe_format_simplify merge damage

2009-12-21 18:20:31 +01:00 · 2009-12-21 18:20:31 +01:00 · 8f1d2ab590
parent ba25137655
commit 8f1d2ab590
1 changed files with 0 additions and 4 deletions
--- 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;