[roll] Roll fuchsia [superproject] Roll third_party/mesa [mesa] Remove conflict marker

This was left in Change-Id: Ifa7af9b210d0e093b4e1c8b35b2624704a9392fc.

Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/1176873
Original-Revision: d285947fda03a889dee17c61726bfdb41c1c30f3
GitOrigin-RevId: e2b97c5a0f1c9038e15a77252fa0d0edb9361495
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1178740
Original-Revision: 47f6f48c19c3bf5e84811f8d3af42ed6bfbfe472
Change-Id: I4003a3b17c6228f44489b0ded8dc7083fa74331c

Author: global-integration-roller

stem

@@ -11,7 +11,7 @@
              githooks="integration/git-hooks"
              remote="https://fuchsia.googlesource.com/fuchsia"
              gerrithost="https://fuchsia-review.googlesource.com"
-             revision="71c0994a7ff69b417f596caa9870e2d5fbedcc83"/>
+             revision="47f6f48c19c3bf5e84811f8d3af42ed6bfbfe472"/>
   </projects>
   <hooks>
     <hook name="install-environment"