Skip to content

Commit

Permalink
One more time!
Browse files Browse the repository at this point in the history
  • Loading branch information
Albert Santoni committed Aug 27, 2014
1 parent f40357f commit 8c86991
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions dev_tools/bootstrap_development_environment.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


0 comments on commit 8c86991

Please sign in to comment.