diff --git a/features.py b/features.py deleted file mode 100644 index 29e9368..0000000 --- a/features.py +++ /dev/null @@ -1,2 +0,0 @@ -print("Great new feature in development branch") - diff --git a/features_v1.py b/features_v1.py new file mode 100644 index 0000000..f8c9b96 --- /dev/null +++ b/features_v1.py @@ -0,0 +1,2 @@ +print("This is the new features.py v1") + diff --git a/macAddress.py b/macAddress.py index e297424..4e6f418 100644 --- a/macAddress.py +++ b/macAddress.py @@ -10,9 +10,6 @@ # python macAddress.py -d 192.168.148.163 -p 1 # -# I think we should switch this to requests -# It is HTTP for Humans, after all. - import httplib, json, urllib, urllib2, optparse import socket, ssl from xml.etree import ElementTree diff --git a/new_feature_v2.py b/new_feature_v2.py new file mode 100644 index 0000000..4272573 --- /dev/null +++ b/new_feature_v2.py @@ -0,0 +1,2 @@ +print("new feature v2 in branch my_new_feature") + diff --git a/tag2_feature.py b/tag2_feature.py new file mode 100644 index 0000000..90e8439 --- /dev/null +++ b/tag2_feature.py @@ -0,0 +1,2 @@ +print("tag 2 feature.py") + diff --git a/tag_feature.py b/tag_feature.py new file mode 100644 index 0000000..d0980f1 --- /dev/null +++ b/tag_feature.py @@ -0,0 +1,2 @@ +print('this is a new feature file with git tag v1') +