Skip to content
Snippets Groups Projects
Commit b27558e8 authored by Cyril Moineau's avatar Cyril Moineau
Browse files

Remove merge conflict artifact.

parent add84a81
No related branches found
No related tags found
1 merge request!333[Fix] Attribute snake case
Pipeline #65848 failed
Stage: static_analysis
    Stage: build
      Stage: test
        Stage: coverage
          Stage: release
            Hide whitespace changes
            Inline Side-by-side
            include/aidge/operator/AvgPooling.hpp
            + 0
            − 5
            View file @ b27558e8
            ......@@ -290,9 +290,4 @@ extern template class Aidge::AvgPooling_Op<2>;
            extern template class Aidge::AvgPooling_Op<3>;
            extern template class Aidge::AvgPooling_Op<4>;
            <<<<<<< HEAD
            =======
            >>>>>>> 9b3579590d612d89cd36f42d47bb396670ef14af
            #endif /* AIDGE_CORE_OPERATOR_AVGPOOLING_H_ */
            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

            Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent