fixed merge conflict

FOSSEE · Oct 29, 2024 · 35d5810 · 35d5810
1 parent 80dca4d
commit 35d5810
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git 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
@@ -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
@@ -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)