Remove merge conflict markers from mandatory_features.txt
authorSlawomir Cygan <slawomir.cygan@intel.com>
Mon, 7 Dec 2020 14:31:05 +0000 (15:31 +0100)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Mon, 7 Dec 2020 20:59:25 +0000 (15:59 -0500)
commit5ab93f6fc5022105024f7dfd13a65502a47d5f6c
tree57cb41218d9979623803508bbbaaa65b16e01017
parent5534dd8f4996f5c37ca19b10299b00cac462b91e
Remove merge conflict markers from mandatory_features.txt

Also fixes same spacing.

Components: Vulkan, Framework
Change-Id: Ia1822f58ed05dc6348b72f2b0711fd60b62beedf
external/vulkancts/scripts/src/mandatory_features.txt