diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2016-05-10 21:52:50 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2016-05-29 19:39:33 +0300 |
| commit | c7590d4ed7ac1204631c0498cd0219291d049b52 (patch) | |
| tree | 371d8da6f025df9137bf651fe94ac9cc39668948 /Makefile | |
| parent | 3503b5569752010e8ff290ba718a415feb05d5a9 (diff) | |
Prevent merge conflicts of the changelog files
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 \ |