diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a19ade077 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union @@ -60,6 +60,8 @@ appstore: clean install-deps optimize-js --exclude=$(project_dir)/build/artifacts \ --exclude=$(project_dir)/node_modules \ --exclude=$(project_dir)/.bowerrc \ + --exclude=$(project_dir)/.gitattributes \ + --exclude=$(project_dir)/.gitignore \ --exclude=$(project_dir)/.jscsrc \ --exclude=$(project_dir)/.jshintrc \ --exclude=$(project_dir)/.jshintignore \ |