Merge pull request #4771 from masterleinad/remove_2type

author Wolfgang Bangerth <bangerth@colostate.edu>

Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)

committer GitHub <noreply@github.com>

Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)
author Wolfgang Bangerth <bangerth@colostate.edu>
Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)
committer GitHub <noreply@github.com>
Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)
diff --cc include/deal.II/dofs/dof_accessor.templates.h
Simple merge
diff --cc include/deal.II/grid/tria_accessor.templates.h
Simple merge
diff --cc source/dofs/dof_handler_policy.cc
Simple merge
author	Wolfgang Bangerth <bangerth@colostate.edu>
	Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)
committer	GitHub <noreply@github.com>
	Sat, 12 Aug 2017 22:31:02 +0000 (16:31 -0600)
		1	2
include/deal.II/dofs/dof_accessor.templates.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/deal.II/grid/tria_accessor.templates.h	patch \|	diff1 \|	diff2 \|	blob \| history
source/dofs/dof_handler_policy.cc	patch \|	diff1 \|	diff2 \|	blob \| history