Skip to content
Snippets Groups Projects
Commit eca96fb0 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov Committed by Mikhail Svechnikov
Browse files

rebase

parent da4f8808
No related branches found
No related tags found
1 merge request!2179Remove 'native data' and 'native units' (#331)
Pipeline #122057 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
GUI/Model/Device/DatafileItem.cpp
+ 0
− 7
View file @ eca96fb0
......@@ -306,14 +306,7 @@ void DatafileItem::copyTo(DatafileItem* const dest) const
GUI::Util::copyContents(this, dest);
if (m_dataItem)
<<<<<<< HEAD
dest->dataItem()->setDatafield(*dataItem()->c_field());
if (m_nativeDataItem)
dest->nativeDataItem()->setDatafield(*nativeDataItem()->c_field());
=======
realdata_dst->dataItem()->setDatafield(*dataItem()->c_field());
>>>>>>> f7e5c9987a (rm all 'nativeUnits')
}
std::vector<int> DatafileItem::shape() const
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment