From e293590520fd5d8153096ec48c9d295fda1ab9ae Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@msn.com>
Date: Tue, 11 Jul 2017 22:04:03 -0400
Subject: [PATCH] Revert "Add vim file ignore rule, and make build work on
 MacOS"

This reverts commit 9a53cba74d2c05cfcce9cf81f2cd2eabf7600098.
---
 .gitignore                     | 5 -----
 java/google/registry/xjc/BUILD | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2adbce6e..64fc08d9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,8 +76,3 @@ autogenerated/
 # Python Ignores
 
 *.pyc
-
-######################################################################
-# Vim Temp Ignores
-*~
-
diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD
index ccba64454..6f1b89cb6 100644
--- a/java/google/registry/xjc/BUILD
+++ b/java/google/registry/xjc/BUILD
@@ -44,9 +44,9 @@ genrule(
         "cp $(SRCS) $$TMP",
         "cd $$TMP",
         "$$XJC -npa -quiet -extension -d $$OUT -b *.xjb *.xsd",
-        ("find $$OUT -name '*.java' | xargs sed -i.bak 's/" +
+        ("find $$OUT -name '*.java' | xargs sed -i 's/" +
          "public class/" +
-         "@SuppressWarnings({\"unchecked\",\"serial\",\"cast\"})\\\n" +
+         "@SuppressWarnings({\"unchecked\",\"serial\",\"cast\"}) " +
          "public class/'"),
         "cd $$REP",
         "rm -rf $$TMP",