Merge branch 'shyam_raghavan' of github.com:aarongut/cdb into shyam_raghavan

Conflicts:
	progress_report/progress_report.dvi
	progress_report/progress_report.fdb_latexmk
	progress_report/progress_report.fls
	progress_report/progress_report.out
	progress_report/progress_report.pdf
	progress_report/progress_report.tex
	progress_report/progress_report.tex.project.vim
	progress_report/progress_report_aux
This commit is contained in:
2015-04-20 20:36:50 -04:00
6 changed files with 74 additions and 0 deletions

View File

@@ -5,7 +5,11 @@ let g:atp_mapNn = 0
let b:atp_autex = 1
let b:atp_TexCompiler = 'pdftex'
let b:atp_TexOptions = '-synctex=1'
<<<<<<< HEAD
let b:atp_TexFlavor = 'tex'
=======
let b:atp_TexFlavor = 'plaintex'
>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
let b:atp_auruns = '1'
let b:atp_ReloadOnError = '1'
let b:atp_OutDir = '/Users/shyam/Dropbox/cdb/progress_report'