Fix clang formats

MirceaDan99 · Sep 26, 2024 · 0e84419 · 0e84419
1 parent 8e2dc85
commit 0e84419
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/plugins/intel_npu/src/al/include/intel_npu/al/icompiler.hpp b/src/plugins/intel_npu/src/al/include/intel_npu/al/icompiler.hpp
@@ -229,10 +229,17 @@ class ICompiler : public std::enable_shared_from_this<ICompiler> {
     // Driver compiler can use this to release graphHandle, if we do not have executor
     virtual void release([[maybe_unused]] std::shared_ptr<const NetworkDescription> networkDescription){};
 
+<<<<<<< HEAD
     virtual CompiledNetwork getCompiledNetwork(const NetworkDescription& networkDescription) {
         return CompiledNetwork(networkDescription.compiledNetwork.data(),
                                networkDescription.compiledNetwork.size(),
                                networkDescription.compiledNetwork);
+=======
+    virtual CompiledNetwork getCompiledNetwork(std::shared_ptr<const NetworkDescription> networkDescription) {
+        return CompiledNetwork{networkDescription->compiledNetwork.data(),
+                               networkDescription->compiledNetwork.size(),
+                               networkDescription->compiledNetwork};
+>>>>>>> 7d2fd96a3c (Fix clang formats)
     }
 
 protected: