Prevent untransforming inner object keys named _p_*

drew-gross · drew-gross · commit c928dcc118aa · 2016-05-23T18:38:48.000-07:00
diff --git a/spec/ParseAPI.spec.js b/spec/ParseAPI.spec.js
@@ -1170,4 +1170,6 @@ describe('miscellaneous', function() {
       done();
     });
   });
+=======
+>>>>>>> Prevent untransforming inner object keys named _p_*
 });

-Original file line number
+Diff line change
       done();
     });
   });
 +=======
 +>>>>>>> Prevent untransforming inner object keys named _p_*
 });