| commit | 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43 | [log] [tgz] |
|---|---|---|
| author | Rajani Karuturi <rajanikaruturi@gmail.com> | Wed Sep 10 12:02:31 2014 +0530 |
| committer | Rajani Karuturi <rajanikaruturi@gmail.com> | Wed Sep 10 12:02:31 2014 +0530 |
| tree | 0c30df485f9d503afa1a20d85be4f6dee11e556c | |
| parent | fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618 [diff] |
ignoring .po and .mo files during merge
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