Skip to content

Commit d11aad2

Browse files
twieckitwiecki
committed
Resolve conflcits
1 parent 5d00d32 commit d11aad2

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

‎requirements-dev.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
# See that file for comments about the need/usage of each dependency.
33

44
aeppl==0.0.31
5-
<<<<<<< HEAD
65
aesara==2.7.2
7-
=======
8-
aesara==2.7.0
9-
>>>>>>> Pin aesara 2.7.0. Remove some dev envs for older python versions. Remove pandas from envs.
106
arviz>=0.12.0
117
cachetools>=4.2.1
128
cloudpickle

‎requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
aeppl==0.0.31
2-
<<<<<<< HEAD
32
aesara==2.7.2
4-
=======
5-
aesara==2.6.2
6-
>>>>>>> Pin aesara 2.7.0. Remove some dev envs for older python versions. Remove pandas from envs.
73
arviz>=0.12.0
84
cachetools>=4.2.1
95
cloudpickle

0 commit comments

Comments
 (0)