commit c2050f89d14dd22fd99c0ff83833078a7c77cf2c
author Jon Ashburn <jon@lunarg.com> Tue Nov 03 13:46:15 2015 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Nov 04 13:15:19 2015 -0700
tree 76af63b7bd64dde6c2c563e35320fbf09b9d4649
parent e922f7185cdc45d0c7423d01cd9278bb0ff352e5

vktrace: Update authorship for generated files

vk_helper.py

diff --git a/vk_helper.py b/vk_helper.py
index 1eb3ddf..17f0151 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -550,12 +550,9 @@
         copyright.append(' * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING');
         copyright.append(' * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER');
         copyright.append(' * DEALINGS IN THE SOFTWARE.');
-<<<<<<< HEAD
-=======
         copyright.append(' *')
         copyright.append(' * Author: Courtney Goeltzenleuchter <courtney@LunarG.com>')
         copyright.append(' * Author: Tobin Ehlis <tobin@lunarg.com>')
->>>>>>> 2edc2f8... misc: Fix build errors from the author changes
         copyright.append(' */');
         copyright.append('');
         return "\n".join(copyright)