Resolved conflicts

Author: sodn-git

connector/setup.py

@@ -180,7 +180,7 @@ def find_version(*paths):
     # package dependencies
     install_requires =  [
         'paramiko >= 1.15.1',
-        'lxml >= 3.3.0, <5.0.0',
+        'lxml >= 3.3.0',
         'ncclient >= 0.6.6',
         'grpcio',
         'protobuf'

ncdiff/Makefile

@@ -88,8 +88,12 @@ develop:
 	@echo ""
 
 	@pip3 uninstall -y yang.ncdiff || true
+<<<<<<< HEAD
 	@pip install $(DEPENDENCIES)
 	@pip install -e . --no-deps
+=======
+	@pip3 install -e .
+>>>>>>> f4865ef (Made changes to support 3.13)
 
 	@echo "Completed building and installing: $@"
 	@echo ""
@@ -162,4 +166,4 @@ changelogs:
 	@echo "yang.ncdiff changelog created..."
 	@echo ""
 	@echo "Done."
-	@echo ""
+	@echo ""