delAuth2

src/reducer/index.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { combineReducers } from "redux";
 import { reducer as formReducer } from 'redux-form';
 
@@ -7,11 +6,4 @@ import users from './users'
 export default  combineReducers({
     users: users,
     form: formReducer,
-=======
-import { combineReducers } from 'redux';
-import { reducer as formReducer } from 'redux-form';
-
-export default combineReducers({
-	form: formReducer,
->>>>>>> origin/Klishyn
 })