diff --git a/Directory.Packages.props.orig b/Directory.Packages.props.orig deleted file mode 100644 index 14097e354..000000000 --- a/Directory.Packages.props.orig +++ /dev/null @@ -1,61 +0,0 @@ - - - true - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - -======= - ->>>>>>> 546c1ffc0 (Fix some rebase errors) - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - -======= - ->>>>>>> 546c1ffc0 (Fix some rebase errors) - - - - - - -