Author: bugman Date: Fri Oct 2 16:11:42 2015 New Revision: 27963 URL: http://svn.gna.org/viewcvs/relax?rev=27963&view=rev Log: Fix for the merger of the frame_order_cleanup branch. Removal of an unused import, to match the branch. Modified: trunk/specific_analyses/frame_order/optimisation.py Modified: trunk/specific_analyses/frame_order/optimisation.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/optimisation.py?rev=27963&r1=27962&r2=27963&view=diff ============================================================================== --- trunk/specific_analyses/frame_order/optimisation.py (original) +++ trunk/specific_analyses/frame_order/optimisation.py Fri Oct 2 16:11:42 2015 @@ -49,7 +49,7 @@ from pipe_control.structure.mass import pipe_centre_of_mass from specific_analyses.frame_order.checks import check_domain, check_model, check_parameters from specific_analyses.frame_order.data import base_data_types, domain_moving, pivot_fixed, tensor_loop -from specific_analyses.frame_order.parameters import assemble_param_vector, assemble_scaling_matrix, linear_constraints +from specific_analyses.frame_order.parameters import assemble_param_vector, linear_constraints from target_functions.frame_order import Frame_order, sobol_data