Fix linting issues in updated file

Wakoma · Sep 29, 2024 · ddab499 · ddab499
1 parent b2c0823
commit ddab499
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/documentation/buildconf.yaml b/documentation/buildconf.yaml
@@ -1,13 +1,13 @@
 AutoCompleteSubNav: true
 CustomCategories:
   consumable:
-    DisplayName: Comsumables
+    DisplayName: Consumables
     Reuse: false
   mech:
     DisplayName: Mechanical Components
     Reuse: false
   net:
-    DisplayName: Networking Compontents
+    DisplayName: Networking Components
     Reuse: false
   prev:
     DisplayName: Previously Assembled

diff --git a/nimble_build_system/utils/nimble_devices_updater.py b/nimble_build_system/utils/nimble_devices_updater.py
@@ -4,7 +4,6 @@
 This module is used to update the devices.json file from a CSV downloaded from nocodb.
 """
 
-import sys
 import csv
 import json
 import argparse
@@ -63,7 +62,7 @@ def main():
     """
 
     args = parse_args()
-    
+
     if args.local:
         if args.url:
             raise RuntimeError("Cannot set an API path and a local file. "

diff --git a/setup.py b/setup.py
@@ -17,11 +17,7 @@
         'cadscript>=0.5.2',
         'exsource-tools',
         'cq-cli @ git+https://github.com/CadQuery/cq-cli.git',
-<<<<<<< HEAD
-        'gitbuilding>=0.0.6',
-=======
         'gitbuilding==0.15.0a4',
->>>>>>> Add script to communicate with networking hardware database
         'cq-annotate @ git+https://github.com/jmwright/cq-annotate.git',
         'cq_warehouse @ git+https://github.com/gumyr/cq_warehouse.git',
         'cadorchestrator'