hopefully fixed conflict issues now

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1072

Mesa.spec

@@ -40,11 +40,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-<<<<<<< .mine
 %define _version 21.3.1
-=======
-%define _version 21.3.0
->>>>>>> .new
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -117,13 +113,8 @@
 %endif
 
 Name:           Mesa
-<<<<<<< .mine
 Version:        21.3.1
 Release:        0
-=======
-Version:        21.3.0
-Release:        0
->>>>>>> .new
 Summary:        System for rendering 3-D graphics
 License:        MIT
 Group:          System/Libraries