Skip to content

Commit 4e6a148

Browse files
bthornton191bthornton191
committed
fixed merge errors
1 parent 576f61c commit 4e6a148

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+8337
-933
lines changed

‎adamspy/postprocess/ppt.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,4 @@ def _get_unique_filename(filename):
400400
filename = new_name + ext
401401
break
402402

403-
return filename
404-
<<<<<<< HEAD
405-
=======
403+
return filename

‎docs/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 44685ca522921807d62020c5d2604ae6
3+
config: 4aacf72b6ead80ffdfa5d3acb61ec85c
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/_modules/adamspy/acar/tire_testrig.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.acar.tire_testrig &mdash; adamspy 0.29.10 documentation</title>
11+
<title>adamspy.acar.tire_testrig &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.10
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adamspy.html‎

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

‎docs/_modules/adamspy/adripy/database.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.database &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.database &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adripy/drillsim.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.drillsim &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.drillsim &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adripy/event.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.event &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.event &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adripy/hole.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.hole &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.hole &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adripy/solver_settings.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.solver_settings &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.solver_settings &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

‎docs/_modules/adamspy/adripy/string.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<meta name="viewport" content="width=device-width, initial-scale=1.0">
1010

11-
<title>adamspy.adripy.string &mdash; adamspy 0.29.13 documentation</title>
11+
<title>adamspy.adripy.string &mdash; adamspy 0.29.14 documentation</title>
1212

1313

1414

@@ -58,7 +58,7 @@
5858

5959

6060
<div class="version">
61-
0.29.13
61+
0.29.14
6262
</div>
6363

6464

0 commit comments

Comments
 (0)