ignoring .po and .mo files during merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/commit/5d59a37d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/tree/5d59a37d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/diff/5d59a37d Branch: refs/heads/master Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43 Parents: fe5b65d Author: Rajani Karuturi <rajanikarut...@gmail.com> Authored: Wed Sep 10 12:02:31 2014 +0530 Committer: Rajani Karuturi <rajanikarut...@gmail.com> Committed: Wed Sep 10 12:02:31 2014 +0530 ---------------------------------------------------------------------- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a4cfe93 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.po merge=ours +*.mo merge=ours
