From 74ee8613d83fde62d7c5890cca1e5fe6eb498ba4 Mon Sep 17 00:00:00 2001
From: Drew Gross <drew.a.gross@gmail.com>
Date: Sat, 21 May 2016 21:43:21 -0700
Subject: [PATCH] Fix inner keys named _rperm, _wperm

---
 spec/ParseAPI.spec.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/ParseAPI.spec.js b/spec/ParseAPI.spec.js
index f8dcc058..cceb818f 100644
--- a/spec/ParseAPI.spec.js
+++ b/spec/ParseAPI.spec.js
@@ -1170,6 +1170,4 @@ describe('miscellaneous', function() {
       done();
     });
   });
-=======
->>>>>>> Prevent untransforming inner object keys named _p_*
 });