[cig-commits] [commit] master: fix merge (e62f65c)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/76d4275352ef2cae5de9a073acd1c03a92c2670c...4f3d06fd1f3754419813db37ec9ef7f0f6f3cb15

>---------------------------------------------------------------

commit e62f65ceaf03eff32a155edbf35e7a7d75f64dd1
Author: Timo Heister <timo.heister at gmail.com>
Date:   Mon May 12 16:13:21 2014 -0400

    fix merge


>---------------------------------------------------------------

e62f65ceaf03eff32a155edbf35e7a7d75f64dd1
 source/simulator/introspection.cc | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/source/simulator/introspection.cc b/source/simulator/introspection.cc
index cf1d1bf..b9aeaad 100644
--- a/source/simulator/introspection.cc
+++ b/source/simulator/introspection.cc
@@ -43,19 +43,6 @@ namespace aspect
 
   template <int dim>
   const unsigned int
-  Introspection<dim>::BlockIndices::velocities;
-
-  template <int dim>
-  const unsigned int
-  Introspection<dim>::BlockIndices::pressure;
-
-  template <int dim>
-  const unsigned int
-  Introspection<dim>::BlockIndices::temperature;
-
-
-  template <int dim>
-  const unsigned int
   Introspection<dim>::BaseElements::velocities;
 
   template <int dim>