diff options
author | Tiago <tiagonbotelho@hotmail.com> | 2017-12-13 13:43:17 +0300 |
---|---|---|
committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 17:15:47 +0300 |
commit | f9642476e646be96b38c9a0b8bc549959900e3cf (patch) | |
tree | aa5a82af244a7e8ed4ca7628d84c85ea186bc72a /vendor/gitignore/Haskell.gitignore | |
parent | c48ab6b2baac9ab1bd36e00396298e27c6f0332e (diff) |
Merge branch '10-3-gitignore' into 'master'
10.3 gitignore and license templates
Closes #10
See merge request gitlab-org/gitlab-ce!15901
(cherry picked from commit 98eda47a52cab6fd250d25bb24d2457e43fa92d1)
f87f4250 Ran bin/rake gitlab:update_templates
Diffstat (limited to 'vendor/gitignore/Haskell.gitignore')
-rw-r--r-- | vendor/gitignore/Haskell.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vendor/gitignore/Haskell.gitignore b/vendor/gitignore/Haskell.gitignore index eee88b2f0f7..82f3a88e17b 100644 --- a/vendor/gitignore/Haskell.gitignore +++ b/vendor/gitignore/Haskell.gitignore @@ -17,5 +17,6 @@ cabal.sandbox.config *.eventlog .stack-work/ cabal.project.local +cabal.project.local~ .HTF/ .ghc.environment.* |