a7acc7f7f4
Conflicts: requirements.txt src/octoprint/filemanager/__init__.py src/octoprint/plugins/cura/profile.py src/octoprint/plugins/cura/static/js/cura.js src/octoprint/plugins/cura/templates/cura_settings.jinja2 src/octoprint/plugins/svgtogcode/__init__.py src/octoprint/printer/__init__.py src/octoprint/server/__init__.py src/octoprint/server/api/files.py src/octoprint/server/api/printer.py src/octoprint/server/api/settings.py src/octoprint/settings.py src/octoprint/static/js/app/main.js src/octoprint/static/js/app/viewmodels/appearance.js src/octoprint/static/js/app/viewmodels/connection.js src/octoprint/static/js/app/viewmodels/control.js src/octoprint/static/js/app/viewmodels/files.js src/octoprint/static/js/app/viewmodels/gcode.js src/octoprint/static/js/app/viewmodels/printerstate.js src/octoprint/static/js/app/viewmodels/settings.js src/octoprint/static/js/app/viewmodels/terminal.js src/octoprint/templates/dialogs/settings.jinja2 src/octoprint/templates/dialogs/settings/serialconnection.jinja2 src/octoprint/templates/index.jinja2 src/octoprint/templates/navbar/settings.jinja2 src/octoprint/templates/stylesheets.jinja2 src/octoprint/util/comm.py
28 lines
482 B
Text
28 lines
482 B
Text
#<<<<<<< HEAD
|
|
#flask==0.9
|
|
#werkzeug==0.8.3
|
|
#tornado==4.0.2
|
|
#sockjs-tornado>=1.0.0
|
|
#PyYAML==3.10
|
|
#Flask-Login==0.2.2
|
|
#Flask-Principal==0.3.5
|
|
#Flask-Babel==0.9
|
|
#pyserial
|
|
#netaddr
|
|
#watchdog
|
|
#sarge>=0.1.4
|
|
#netifaces
|
|
#pylru
|
|
#rsa
|
|
#=======
|
|
###
|
|
# This file is only here to make sure that something like
|
|
#
|
|
# pip install -e .[develop]
|
|
#
|
|
# works as expected. Requirements can be found in setup.py in the
|
|
# variables INSTALL_REQUIRES and EXTRA_REQUIRES.
|
|
###
|
|
|
|
.
|
|
#>>>>>>> upstream/maintenance
|