diff options
Diffstat (limited to 'src/libslic3r/ShortestPath.cpp')
| -rw-r--r-- | src/libslic3r/ShortestPath.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libslic3r/ShortestPath.cpp b/src/libslic3r/ShortestPath.cpp index 47d638054..449ff45b5 100644 --- a/src/libslic3r/ShortestPath.cpp +++ b/src/libslic3r/ShortestPath.cpp @@ -1766,10 +1766,6 @@ static inline std::pair<double, size_t> minimum_crossover_cost( return std::make_pair(cost_min, flip_min); } -<<<<<<< HEAD -#if 0 -======= ->>>>>>> master // Currently not used, too slow. static inline void reorder_by_three_exchanges_with_segment_flipping2(std::vector<FlipEdge> &edges) { |