1

TreshMom · Mar 1, 2024 · e2ecf9a · e2ecf9a
1 parent f83c8ee
commit e2ecf9a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/project/__init__.py b/project/__init__.py
@@ -1,8 +1,9 @@
 from .task_2 import regex_to_min_dfa, create_nfa
 from .task_1 import graph_info, create_labeled_two_cycle_graph
 
-__all__ = ["graph_info", "create_labeled_two_cycle_graph"]
-<<<<<<< HEAD
-__all__ = ["regex_to_min_dfa", "create_nfa"]
-=======
->>>>>>> main
+__all__ = [
+    "graph_info",
+    "create_labeled_two_cycle_graph",
+    "regex_to_min_dfa",
+    "create_nfa",
+]