let SessionLoad = 1 let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 let v:this_session=expand(":p") silent only silent tabonly <<<<<<< HEAD cd ~/Documents/Dane\'s\ Vault/5\ Thesis ======= cd ~/Documents/Dane\'s\ Vault >>>>>>> origin/master if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' let s:wipebuf = bufnr('%') endif let s:shortmess_save = &shortmess if &shortmess =~ 'A' set shortmess=aoOA else set shortmess=aoO endif <<<<<<< HEAD badd +16 4\ Meetings/DGC_DAS_328.md badd +32 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md argglobal %argdel edit 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md argglobal balt 4\ Meetings/DGC_DAS_328.md ======= badd +16 5\ Thesis/4\ Meetings/DGC_DAS_328.md badd +4 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md argglobal %argdel edit 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md argglobal balt 5\ Thesis/4\ Meetings/DGC_DAS_328.md >>>>>>> origin/master setlocal fdm=manual setlocal fde=0 setlocal fmr={{{,}}} setlocal fdi=# setlocal fdl=0 setlocal fml=1 setlocal fdn=20 setlocal fen silent! normal! zE let &fdl = &fdl <<<<<<< HEAD let s:l = 11 - ((10 * winheight(0) + 27) / 55) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt keepjumps 11 normal! 058| ======= let s:l = 13 - ((12 * winheight(0) + 36) / 73) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt keepjumps 13 normal! 0 >>>>>>> origin/master tabnext 1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' silent exe 'bwipe ' . s:wipebuf endif unlet! s:wipebuf set winheight=1 winwidth=20 let &shortmess = s:shortmess_save let s:sx = expand(":p:r")."x.vim" if filereadable(s:sx) exe "source " . fnameescape(s:sx) endif let &g:so = s:so_save | let &g:siso = s:siso_save set hlsearch doautoall SessionLoadPost unlet SessionLoad " vim: set ft=vim :