diff options
author | Kenneth Heafield <github@kheafield.com> | 2012-09-27 21:30:38 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2012-09-27 21:30:38 +0400 |
commit | 1e3f85b96a0756fa01422cadce891140173dc44d (patch) | |
tree | 55d3f44bd17a58443b6673e5e1c460e66ef66770 /.gitmodules | |
parent | fec0cb75955e67770d476bf98e56d8dd9b50231a (diff) | |
parent | 06887948402960ec3199ddcb30ac7944eef9b6e7 (diff) |
Merge remote-tracking branch 'upstream/master'
Conflicts:
.gitmodules
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 693ae6daa..01f80a2c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "regression-testing/tests"] path = regression-testing/tests - url = ../moses-regression-tests.git + url = git@github.com:moses-smt/moses-regression-tests.git [submodule "lazy"] path = lazy url = git@github.com:kpu/lazy |