mesa: fixed conflicts in md5sum and footprint

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index 3f1f7ab1959ba8533663d8342b1acb0eac718188..d7d92339cefef7ba641dd1fa62f6a5e87fbe6f9c 100644 (file)
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -50,17 +50,10 @@ lrwxrwxrwx  root/root       usr/lib/libGLESv1_CM.so.1 -> libGLESv1_CM.so.1.1.0
 lrwxrwxrwx     root/root       usr/lib/libGLESv2.so -> libGLESv2.so.2.0.0
 lrwxrwxrwx     root/root       usr/lib/libGLESv2.so.2 -> libGLESv2.so.2.0.0
 -rwxr-xr-x     root/root       usr/lib/libGLESv2.so.2.0.0
-<<<<<<< HEAD
--rwxr-xr-x     root/root       usr/lib/libdricore9.0.1.la
-lrwxrwxrwx     root/root       usr/lib/libdricore9.0.1.so -> libdricore9.0.1.so.1.0.0
-lrwxrwxrwx     root/root       usr/lib/libdricore9.0.1.so.1 -> libdricore9.0.1.so.1.0.0
--rwxr-xr-x     root/root       usr/lib/libdricore9.0.1.so.1.0.0
-=======
 -rwxr-xr-x     root/root       usr/lib/libdricore9.0.2.la
 lrwxrwxrwx     root/root       usr/lib/libdricore9.0.2.so -> libdricore9.0.2.so.1.0.0
 lrwxrwxrwx     root/root       usr/lib/libdricore9.0.2.so.1 -> libdricore9.0.2.so.1.0.0
 -rwxr-xr-x     root/root       usr/lib/libdricore9.0.2.so.1.0.0
->>>>>>> af48ac0... mesa3d: updated to 9.0.2
 -rwxr-xr-x     root/root       usr/lib/libglapi.la
 lrwxrwxrwx     root/root       usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx     root/root       usr/lib/libglapi.so.0 -> libglapi.so.0.0.0

diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index 1fc420b590cd5bc0c48300c3f29595f288ec9e5e..65cc59960de2463bf1fd73962f6e8af9efeb5cfb 100644 (file)
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1,5 +1 @@
-<<<<<<< HEAD
-97d6554c05ea7449398afe3a0ede7018  MesaLib-9.0.1.tar.bz2
-=======
 dc45d1192203e418163e0017640e1cfc  MesaLib-9.0.2.tar.bz2
->>>>>>> af48ac0... mesa3d: updated to 9.0.2