Small fixes to snipper

src/codesnipper.egg-info/PKG-INFO

-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: codesnipper
-Version: 0.1.18.16
+Version: 0.1.18.18
 Summary: A lightweight framework for censoring student solutions files and extracting code + output
 Home-page: https://lab.compute.dtu.dk/tuhe/snipper
 Author: Tue Herlau
@@ -15,6 +15,18 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pybtex
 Requires-Dist: numpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Snipper
 A lightweight framework for removing code from student solutions.

src/snipper/snipper_main.py

@@ -47,14 +47,11 @@ def censor_file(file, run_files=True, run_out_dirs=None, cut_files=True,
                 strict=True,
                 references=None,
                 license_head=None,
-<<<<<<< HEAD
                 package_base_dir=None,
-                update_file=True # Update the file 'file' (i.e., write to it).
+                update_file=True, # Update the file 'file' (i.e., write to it).
+                verbose=False,
                 ):
-=======
-                package_base_dir=None, verbose=False):
 
->>>>>>> 90ebeca37d37eb3863a0984dba7d5dde2aa7e880
     if str(file).endswith("rst"):
         assert not run_files and not cut_files and not censor_files
 

src/snipper/version.py

-__version__ = "0.1.18.16"
+__version__ = "0.1.18.18"