merged

TheAnyKey · TheAnyKey · commit e17847897a76 · 2020-05-07T19:14:41.000Z
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -320,8 +320,6 @@ impl PyDictRef {
         PyDictRef::merge(&self.entries, dict_obj, kwargs, vm)
     }
 
-<<<<<<< HEAD
-=======
     #[pymethod(name = "__ior__")]
     fn ior(self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {
         let dicted: Result<PyDictRef, _> = other.clone().downcast();
@@ -354,7 +352,6 @@ impl PyDictRef {
         Err(vm.new_type_error("__or__ not implemented for non-dict type".to_owned()))
     }
 
->>>>>>> 41849ab5... fixed: returned wrong error when union opration is invoked with other type. So far it was a key error now it is a type error.
     #[pymethod]
     fn pop(
         self,

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,6 @@ impl PyDictRef {`
`320`	`320`	`PyDictRef::merge(&self.entries, dict_obj, kwargs, vm)`
`321`	`321`	`}`
`322`	`322`
`323`		`-<<<<<<< HEAD`
`324`		`-=======`
`325`	`323`	`#[pymethod(name = "__ior__")]`
`326`	`324`	`fn ior(self, other: PyObjectRef, vm: &VirtualMachine) -> PyResult {`
`327`	`325`	`let dicted: Result<PyDictRef, _> = other.clone().downcast();`
`@@ -354,7 +352,6 @@ impl PyDictRef {`
`354`	`352`	`Err(vm.new_type_error("__or__ not implemented for non-dict type".to_owned()))`
`355`	`353`	`}`
`356`	`354`
`357`		`->>>>>>> 41849ab5... fixed: returned wrong error when union opration is invoked with other type. So far it was a key error now it is a type error.`
`358`	`355`	`#[pymethod]`
`359`	`356`	`fn pop(`
`360`	`357`	`self,`