Replace some ammo field references with resources

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 3deea699e07ef4dc07dcebab404c926355ed0bf2..9745f61361ea974460edaf8e9c90a96700d78cb1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  7 19:43:03 CET 2017
+Sun Jun  3 07:24:16 CEST 2018