[travis] update builder_definitions

.gitsuper

 [supermodule]
 remote = git@github.com:dune-community/dune-xt-super.git
 status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
+<<<<<<< HEAD
 	 28c9ce81c14c878a71e907ab05b9bb72df77883e config.opts (remotes/origin/HEAD)
 	 f308c6637edd65dcb83c4c1a46feaf05b958130e dune-alugrid (v2.6.0-7-gf308c663)
 	 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58 dune-common (v2.2.1-2269-g76d7f0c9)
@@ -17,6 +18,25 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	+3690cf22797c0b201b7903252eec2f8f170fc36d dune-xt-functions (heads/forked_pr_test)
 	+c040a8a372ee78a91740334dbe3f15050f966bcc dune-xt-grid (heads/avoid_forked_pr_fail)
 	+0d83a0373865c1893197c54497b462cd99404d72 dune-xt-la (heads/avoid_forked_pr_fail)
+=======
+	 5147d438044a772a07fd89ff142d861cfc82212e config.opts (5147d43)
+	 8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
+	 707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
+	 e6350271b8d014adab51467a35b6ad8ef48212a0 dune-geometry (v2.5.1-6-ge635027)
+	 d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5)
+	 e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33)
+	 63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
+	 0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
+	 8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
+	 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
+	 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/dune_xt)
+	 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
+	+603ad2932f91cbb56e2294c6bdb02185574cd372 dune-xt-common (heads/fix_issue_149)
+	 7694fbeee4a57b162d404a497e6254721468a3ee dune-xt-data (heads/master)
+	+2c8ac0d32d7b89c2ab4b4a2cd237e7ebd6cae1ee dune-xt-functions (heads/update_indicator_tests)
+	 dce37865d57ea07c2532375cfb6bd1aedf984dc6 dune-xt-grid (remotes/origin/new-master-3-gdce3786)
+	 9572c6b635365ed9b9a8ff013015834a39ae3c4f dune-xt-la (remotes/origin/python_infrastructure_update-184-g9572c6b)
+>>>>>>> [travis] update builder_definitions
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
 commit = 0318dd89aa1301a15fcdacf7507f067ee0377ae3
 
@@ -93,7 +113,11 @@ commit = f3b5293fc63d3db21ec25c9a12af68ddd9a3c0d9
 [submodule.dune-xt-functions]
 remote = git@github.com:dune-community/dune-xt-functions.git
 status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+<<<<<<< HEAD
 commit = 3690cf22797c0b201b7903252eec2f8f170fc36d
+=======
+commit = 2c8ac0d32d7b89c2ab4b4a2cd237e7ebd6cae1ee
+>>>>>>> [travis] update builder_definitions
 
 [submodule.dune-xt-grid]
 remote = git@github.com:dune-community/dune-xt-grid.git