From 35d581068aee1f140eca3105e36396c06fd0c435 Mon Sep 17 00:00:00 2001
From: ThaHobbyist <dipdeys.dey@gmail.com>
Date: Tue, 29 Oct 2024 18:46:17 +0530
Subject: [PATCH] fixed merge conflict

---
 .vscode/settings.json                            | 16 ----------------
 MANIFEST.in                                      |  3 ++-
 .../Reader/reader_tests/dicts/simpleDict         |  7 +++++++
 pyvnt/Converter/Reader/reader_tests/printDict.py |  9 +++++++++
 4 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 816c946..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "files.associations": {
-        "dictionaryFile.C": "cpp",
-        "*Dict": "OpenFOAM",
-        "*Properties": "OpenFOAM",
-        "fvSchemes": "OpenFOAM",
-        "fvSolution": "OpenFOAM",
-        "**/constant/g": "OpenFOAM",
-        "**/0/*": "OpenFOAM"
-    },
-    "python.testing.pytestArgs": [
-        "tests"
-    ],
-    "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
-}
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 6be7910..a3fc1b4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include pyvnt/Converter/Reader/cpp_src/dictionaryFile/lib/dictionaryFile.so
-include pyvnt/Converter/Reader/cpp_src/dictionaryFileChecker/bin/dictionaryFileChecker
+include pyvnt/Converter/Reader/cpp_src/dictionaryFileChecker/bin/dictionaryFileChecker.so
 include pyvnt/Converter/Reader/cpp_src/dictionaryFileIterator/lib/dictionaryFileIterator.so
+include pyvnt/Converter/Reader/cpp_src/libOpenFOAM.so
diff --git a/pyvnt/Converter/Reader/reader_tests/dicts/simpleDict b/pyvnt/Converter/Reader/reader_tests/dicts/simpleDict
index 3499c38..39a4c7e 100644
--- a/pyvnt/Converter/Reader/reader_tests/dicts/simpleDict
+++ b/pyvnt/Converter/Reader/reader_tests/dicts/simpleDict
@@ -6,6 +6,7 @@ key2            35.8 67;
 
 key3            value1;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 // key5
 // (
@@ -23,6 +24,8 @@ key6
 
 =======
 >>>>>>> acb2eb0 (fixed merge conflict)
+=======
+>>>>>>> 2a673f5 (fixed merge conflict)
 key4
 {
     key41           value1;
@@ -31,7 +34,11 @@ key4
 
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 
 >>>>>>> acb2eb0 (fixed merge conflict)
+=======
+
+>>>>>>> 2a673f5 (fixed merge conflict)
diff --git a/pyvnt/Converter/Reader/reader_tests/printDict.py b/pyvnt/Converter/Reader/reader_tests/printDict.py
index b5e1ec7..e037bbc 100644
--- a/pyvnt/Converter/Reader/reader_tests/printDict.py
+++ b/pyvnt/Converter/Reader/reader_tests/printDict.py
@@ -2,10 +2,14 @@
 import os
 import sys
 <<<<<<< HEAD
+<<<<<<< HEAD
 from pyvnt import read, show_tree, writeTo
 =======
 from pyvnt import read
 >>>>>>> acb2eb0 (fixed merge conflict)
+=======
+from pyvnt import read
+>>>>>>> 2a673f5 (fixed merge conflict)
 
 
 dictFilesFolder = os.path.join(os.path.dirname(__file__), 'dicts')
@@ -15,6 +19,7 @@
 if len(sys.argv) > 1:
   dictFile = os.path.join(dictFilesFolder, sys.argv[1])
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 tree = read(dictFile)
 
@@ -24,3 +29,7 @@
 tree = dw.read(dictFile)
 tree.dispTree()
 >>>>>>> acb2eb0 (fixed merge conflict)
+=======
+tree = dw.read(dictFile)
+tree.dispTree()
+>>>>>>> 2a673f5 (fixed merge conflict)