Gregor Zattler <telegr...@gmx.net> writes: > Dear org-mode developers, I did a git pull half an hour ago, now I > cannot org-babel-load-file my configuration.org any more. Normally I > use emacs as of git master but the (slightly different) error also > occours with emacs 25.1.1 (as of currents debian stable) (see below). > > I did a git bisect on the org repo and got this: > ba321d0e44b34840466dd386223f702615ff8562 is the first bad commit
Sorry, that certainly looks to be my fault (specifically, my conflict resolution merging maint's d64c9a996). I'll have a look. -- Kyle
