resolved merge conflicts

nsls2api/cli/main.py

@@ -0,0 +1,19 @@
+import typer
+
+import admin
+import api
+import auth
+import beamline
+import facility
+import proposal
+
+app = typer.Typer()
+app.add_typer(admin.app, name="admin", help="Do powerful admin level magic")
+app.add_typer(api.app, name="api", help="Make NSLS-II API request")
+app.add_typer(auth.app, name="auth", help="Stuff about security and fun")
+app.add_typer(beamline.app, name="beamline", help="Stuff about Beamlines")
+app.add_typer(facility.app, name="facility", help="Stuff about Facilities")
+app.add_typer(proposal.app, name="proposal", help="Stuff about Proposals")
+
+if __name__ == "__main__":
+    app()

pyproject.toml

@@ -8,6 +8,7 @@ dynamic = ["version"]
 description = ''
 readme = "README.md"
 requires-python = ">=3.9"
+license = "BSD-3-Clause"
 keywords = []
 authors = [
   { name = "Stuart Campbell", email = "scampbell@bnl.gov" },