Add updated pathgrid marker nif file and fix merge issues.

apps/opencs/view/render/cell.cpp

@@ -93,7 +93,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
     bool modified = false;
 
     const CSMWorld::RefCollection& collection = mData.getReferences();
-    
+
     for (int i=start; i<=end; ++i)
     {
         std::string cell = Misc::StringUtils::lowerCase (collection.getRecord (i).get().mCell);
@@ -177,7 +177,6 @@ CSVRender::Cell::~Cell()
     if (mTerrain.get())
         mPhysics->removeHeightField(mSceneMgr, mX, mY);
 
-
     for (std::map<std::string, Object *>::iterator iter (mObjects.begin());
         iter!=mObjects.end(); ++iter)
         delete iter->second;

apps/opencs/view/render/cell.hpp

@@ -11,11 +11,8 @@
 
 #ifndef Q_MOC_RUN
 #include <components/terrain/terraingrid.hpp>
-<<<<<<< .mine
 #include <components/esm/loadpgrd.hpp>  // FIXME: temporaty storage until saving to document
-=======
 #endif
->>>>>>> .theirs
 
 #include "object.hpp"