70:b2ed3aee8024
Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 18:00:24 +0800
git prompt session: demonstrate merge with conflicts
previous change 14:cb8ef1bc6712

geany/filedefs/filetypes.html

Permissions: -rw-r--r--

File Latest Revisions Annotate Diff Comparison
Other formats:
JSON Raw
Feeds:
Atom RSS 
[indentation]
# 0 is spaces, 1 is tabs, 2 is tab & spaces
type=0
width=2