From 8c869914f02c9dda2c55a9b4a1cc84d6a52b16ad Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 27 Aug 2014 16:52:06 -0400 Subject: [PATCH] One more time! --- dev_tools/bootstrap_development_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_tools/bootstrap_development_environment.sh b/dev_tools/bootstrap_development_environment.sh index d3876b9c5..5ca83a5ca 100755 --- a/dev_tools/bootstrap_development_environment.sh +++ b/dev_tools/bootstrap_development_environment.sh @@ -3,7 +3,7 @@ # Set up 3 way PO file merging, which we need for non-mainline branches cp scripts/git-merge-po /usr/local/bin chmod +x /usr/local/bin/git-merge-po -cat git-config-git-merge-po >> ../.git/config -cat git-attributes-git-merge-po >> ../.gitattributes +cat scripts/git-config-git-merge-po >> ../.git/config +cat scripts/git-attributes-git-merge-po >> ../.gitattributes