diff options
Diffstat (limited to 'resources/profiles/Artillery.idx')
| -rw-r--r-- | resources/profiles/Artillery.idx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/resources/profiles/Artillery.idx b/resources/profiles/Artillery.idx index b66511192..181f667e5 100644 --- a/resources/profiles/Artillery.idx +++ b/resources/profiles/Artillery.idx @@ -1,11 +1,7 @@ -<<<<<<< HEAD -min_slic3r_version = 2.3.1-beta
-======= min_slic3r_version = 2.4.1-alpha0
0.0.5 Added Artillery Hornet
min_slic3r_version = 2.3.1-beta
0.0.4 Fixed first layer height in 0.28mm profile.
->>>>>>> master 0.0.3 Fixed Genius bed size.
0.0.2 Updated start g-code.
0.0.1 Initial Artillery bundle
|