fixed merge

This commit is contained in:
Jonas Rosling 2012-07-03 14:50:25 +02:00
commit 8b330c3706
1 changed files with 26 additions and 0 deletions

26
ftyperc
View File

@ -895,6 +895,32 @@
*.erl
-syntax erlang
-autoindent
-tab 4
*.eterm
-syntax erlang
-autoindent
-tab 4
*.app.src
-syntax erlang
-autoindent
-tab 4
*rebar.config
-syntax erlang
-autoindent
-tab 4
*.hrl
-syntax erlang
-autoindent
-tab 4
*.erlang
-syntax erlang
-autoindent
-tab 4
Sieve (ManageSieve)
*.sieve