Changeset View
Changeset View
Standalone View
Standalone View
src/resources/vue/components/User/Profile.vue
Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines | <div class="container"> | ||||
</div> | </div> | ||||
<div class="form-group row"> | <div class="form-group row"> | ||||
<label for="password_confirmaton" class="col-sm-4 col-form-label">Confirm password</label> | <label for="password_confirmaton" class="col-sm-4 col-form-label">Confirm password</label> | ||||
<div class="col-sm-8"> | <div class="col-sm-8"> | ||||
<input type="password" class="form-control" id="password_confirmation" v-model="profile.password_confirmation"> | <input type="password" class="form-control" id="password_confirmation" v-model="profile.password_confirmation"> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
<button class="btn btn-primary" type="submit">Submit</button> | <button class="btn btn-primary" type="submit">Submit</button> | ||||
<router-link class="btn btn-danger" to="profile-delete" tag="button">Delete account</router-link> | |||||
vanmeeuwen: This is where a merge on to current origin/master fails. Please double-check the intended… | |||||
</form> | </form> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
</template> | </template> | ||||
<script> | <script> | ||||
Show All 34 Lines |
This is where a merge on to current origin/master fails. Please double-check the intended result.