Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp authored Aug 27, 2024
2 parents 2695cf4 + 9b25919 commit c11cfa5
Show file tree
Hide file tree
Showing 10 changed files with 4,461 additions and 16 deletions.
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
BSD 3-Clause License

Copyright (c) 2024, conda
Copyright (c) 2012, Anaconda, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 2 additions & 2 deletions conda_classic_solver/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright (C) 2022 Anaconda, Inc
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause
"""
The conda_classic_solver package
"""

from .solver import ClassicSolver # noqa
from .solve import ClassicSolver # noqa
Loading

0 comments on commit c11cfa5

Please sign in to comment.