Fix TIDINGS.rst, again.

ynikitenko · Nov 7, 2021 · dc572ca · dc572ca
1 parent b8bf1bd
commit dc572ca
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/TIDINGS.rst b/TIDINGS.rst
@@ -20,12 +20,6 @@ Python code (outside Lena framework).
 Vector3 gets a stable initialization interface
 (not from a list, but from 3 coordinate values).
 
-Histogram structure becomes more robust and can be used in other
-Python code (outside Lena framework).
-
-Vector3 gets a stable initialization interface
-(not from a list, but from 3 coordinate values).
-
 Adds new elements and a new module input.
 
 * lena.flow changes:
@@ -103,7 +97,6 @@ Deprecations and backward incompatible changes
 
 * lena.flow changes:
 
-<<<<<<< HEAD
   * Renames flow.ISlice to Slice. ISlice is deprecated.
   * Renames TransformBins to IterateBins.
     Completely rework its context handling.