Resolving conflicts

aliabbasrizvi · aliabbasrizvi · commit 2cfb7632664a · 2017-03-23T12:05:25.000-07:00
diff --git a/optimizely/project_config.py b/optimizely/project_config.py
@@ -220,7 +220,6 @@ def get_audience(self, audience_id):
     """
 
     audience = self.audience_id_map.get(audience_id)
-
     if audience:
       return audience
 
diff --git a/tests/test_bucketing.py b/tests/test_bucketing.py
@@ -1,4 +1,4 @@
-# Copyright 2016, Optimizely
+# Copyright 2016-2017, Optimizely
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2016, Optimizely`
	`1`	`+# Copyright 2016-2017, Optimizely`
`2`	`2`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`3`	`3`	`# you may not use this file except in compliance with the License.`
`4`	`4`	`# You may obtain a copy of the License at`