projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4cd531
78b4192
)
Merge branch 'master' of https://github.com/Kendos-Kenlen/intellij-community into...
author
Dmitry Avdeev
<dmitry.avdeev@jetbrains.com>
Wed, 13 Jul 2016 17:40:41 +0000
(20:40 +0300)
committer
Dmitry Avdeev
<dmitry.avdeev@jetbrains.com>
Wed, 13 Jul 2016 17:40:41 +0000
(20:40 +0300)
1
2
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
Simple merge