Skip to content

Commit

Permalink
Merge branch 'master' into sort-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Beacom authored Sep 8, 2017
2 parents 1c96bae + e04b348 commit 8f94de5
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion examples/events.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# encoding: utf-8
# -*- coding: utf-8 -*-

"""
This is an example of a locustfile that uses Locust's built in event hooks to
Expand Down
2 changes: 1 addition & 1 deletion locust/runners.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coding=UTF-8
# -*- coding: utf-8 -*-
import logging
import random
import socket
Expand Down
2 changes: 1 addition & 1 deletion locust/test/test_web.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# encoding: utf-8
# -*- coding: utf-8 -*-
import csv
import json
import sys
Expand Down
2 changes: 1 addition & 1 deletion locust/web.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# encoding: utf-8
# -*- coding: utf-8 -*-

import csv
import json
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# encoding: utf-8
# -*- coding: utf-8 -*-
import ast
import os
import re
Expand Down

0 comments on commit 8f94de5

Please sign in to comment.