Skip to content

Commit fc5903a

Browse files
Saumya Garggargsaumya
authored andcommitted
resolve review comments
1 parent b5a7d5a commit fc5903a

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

mssql_python/pybind/ddbc_bindings.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT license.
33

4-
<<<<<<< HEAD
54
// INFO|TODO - Note that is file is Windows specific right now. Making it arch agnostic will be
65
// taken up in future.
76

8-
=======
9-
>>>>>>> 25d6ef0 (refactor native layer and create reusable components)
7+
>>>>>>> 1182190 (resolve review comments)
108
#pragma once
119

1210
#include <Windows.h>

0 commit comments

Comments
 (0)